diff --git a/MuseumGame/Assets/Animations/FireHydrantIdle.anim b/MuseumGame/Assets/Animations/FireHydrantIdle.anim new file mode 100644 index 0000000..a30e280 --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrantIdle.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FireHydrantIdle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 2767316081879700064, guid: e20749d0789c86a48808ad957c8be8a1, type: 3} + - time: 0.083333336 + value: {fileID: -5296411866255841955, guid: e20749d0789c86a48808ad957c8be8a1, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 2767316081879700064, guid: e20749d0789c86a48808ad957c8be8a1, type: 3} + - {fileID: -5296411866255841955, guid: e20749d0789c86a48808ad957c8be8a1, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/MuseumGame/Assets/Animations/FireHydrantIdle.anim.meta b/MuseumGame/Assets/Animations/FireHydrantIdle.anim.meta new file mode 100644 index 0000000..cd8d4e6 --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrantIdle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 93eb340f3b4333945b795af5a08d5242 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/FireHydrantMotion.anim b/MuseumGame/Assets/Animations/FireHydrantMotion.anim new file mode 100644 index 0000000..779ee36 --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrantMotion.anim @@ -0,0 +1,71 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FireHydrantMotion + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 239851139560492020, guid: 3673d79a8087d434d8c0fb425852d32c, type: 3} + - time: 0.083333336 + value: {fileID: 2832624808901054014, guid: 3673d79a8087d434d8c0fb425852d32c, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 239851139560492020, guid: 3673d79a8087d434d8c0fb425852d32c, type: 3} + - {fileID: 2832624808901054014, guid: 3673d79a8087d434d8c0fb425852d32c, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/MuseumGame/Assets/Animations/FireHydrantMotion.anim.meta b/MuseumGame/Assets/Animations/FireHydrantMotion.anim.meta new file mode 100644 index 0000000..df86355 --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrantMotion.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 40b657b3900b2da489d80fa958b33475 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/FireHydrantTop_0.controller b/MuseumGame/Assets/Animations/FireHydrantTop_0.controller new file mode 100644 index 0000000..47f4641 --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrantTop_0.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-6878359440363053390 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1120854864417402990} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1120854864417402990} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FireHydrantTop_0 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -6878359440363053390} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &1120854864417402990 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FireHydrantMotion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 40b657b3900b2da489d80fa958b33475, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/MuseumGame/Assets/Animations/FireHydrantTop_0.controller.meta b/MuseumGame/Assets/Animations/FireHydrantTop_0.controller.meta new file mode 100644 index 0000000..f9c9bf6 --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrantTop_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 94156a1fe07206245a4ebdf9a59139f9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Animations/FireHydrant_0.controller b/MuseumGame/Assets/Animations/FireHydrant_0.controller new file mode 100644 index 0000000..352bdec --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrant_0.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-2134304726680170983 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FireHydrantMotion + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6312312966307852155} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 40b657b3900b2da489d80fa958b33475, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-117814025623963102 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Firing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2134304726680170983} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FireHydrant_0 + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Firing + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 5636637908158059955} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &4073903779123821134 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: FireHydrantIdle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -117814025623963102} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 93eb340f3b4333945b795af5a08d5242, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &5636637908158059955 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 4073903779123821134} + m_Position: {x: 220, y: -40, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2134304726680170983} + m_Position: {x: 341.8882, y: 158.62, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 4073903779123821134} +--- !u!1101 &6312312966307852155 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Firing + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4073903779123821134} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/MuseumGame/Assets/Animations/FireHydrant_0.controller.meta b/MuseumGame/Assets/Animations/FireHydrant_0.controller.meta new file mode 100644 index 0000000..f4511b0 --- /dev/null +++ b/MuseumGame/Assets/Animations/FireHydrant_0.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 31910a53a475fde48ba81aae5d9f4d36 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/EnemyProjectile.prefab b/MuseumGame/Assets/Prefabs/EnemyProjectile.prefab index 40284ad..01a7366 100644 --- a/MuseumGame/Assets/Prefabs/EnemyProjectile.prefab +++ b/MuseumGame/Assets/Prefabs/EnemyProjectile.prefab @@ -134,3 +134,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be01dfcc287111349ae199a2637312b9, type: 3} m_Name: m_EditorClassIdentifier: + lifeSpan: 5 diff --git a/MuseumGame/Assets/Prefabs/FHWater.prefab b/MuseumGame/Assets/Prefabs/FHWater.prefab new file mode 100644 index 0000000..ed227e2 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/FHWater.prefab @@ -0,0 +1,137 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2612905944174990354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1677506424665737715} + - component: {fileID: 2707245237205643159} + - component: {fileID: 3600172430457571996} + - component: {fileID: -5957703061759159672} + - component: {fileID: -4210805452758251945} + m_Layer: 0 + m_Name: FHWater + m_TagString: EnemyProjectile + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1677506424665737715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612905944174990354} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.1509, y: 2.7491, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &2707245237205643159 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612905944174990354} + 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: 4adeaf2d2b1c7417e89f026626d8264f, 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!114 &3600172430457571996 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612905944174990354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: be01dfcc287111349ae199a2637312b9, type: 3} + m_Name: + m_EditorClassIdentifier: + lifeSpan: 1 +--- !u!50 &-5957703061759159672 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612905944174990354} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &-4210805452758251945 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2612905944174990354} + 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} + serializedVersion: 2 + m_Radius: 0.5 diff --git a/MuseumGame/Assets/Prefabs/FHWater.prefab.meta b/MuseumGame/Assets/Prefabs/FHWater.prefab.meta new file mode 100644 index 0000000..fa853e3 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/FHWater.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1cc39bc319e811449a8a93e80037bb1f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Prefabs/FireHydrant_0.prefab b/MuseumGame/Assets/Prefabs/FireHydrant_0.prefab new file mode 100644 index 0000000..211dbf5 --- /dev/null +++ b/MuseumGame/Assets/Prefabs/FireHydrant_0.prefab @@ -0,0 +1,120 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4742363870248418081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4742363870248418085} + - component: {fileID: 4742363870248418086} + - component: {fileID: 4742363870248418087} + - component: {fileID: 4742363870248418080} + m_Layer: 0 + m_Name: FireHydrant_0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4742363870248418085 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742363870248418081} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.3972616, y: -2.3957255, 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 &4742363870248418086 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742363870248418081} + 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: 2767316081879700064, guid: e20749d0789c86a48808ad957c8be8a1, 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!95 &4742363870248418087 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742363870248418081} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 31910a53a475fde48ba81aae5d9f4d36, 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!114 &4742363870248418080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4742363870248418081} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68d7ea05e5640cb4c9b4e853dbde77c5, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 2612905944174990354, guid: 1cc39bc319e811449a8a93e80037bb1f, type: 3} + projSpeed: 5 + timeBetween: 3 diff --git a/MuseumGame/Assets/Prefabs/FireHydrant_0.prefab.meta b/MuseumGame/Assets/Prefabs/FireHydrant_0.prefab.meta new file mode 100644 index 0000000..440fd0e --- /dev/null +++ b/MuseumGame/Assets/Prefabs/FireHydrant_0.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bbe6a31f746412142b22ccb6e411c98c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Scenes/MatthewTestScene.unity b/MuseumGame/Assets/Scenes/MatthewTestScene.unity index 8492564..f56f0ee 100644 --- a/MuseumGame/Assets/Scenes/MatthewTestScene.unity +++ b/MuseumGame/Assets/Scenes/MatthewTestScene.unity @@ -1646,3 +1646,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e9268c7f81b604f459302eb8b45a432e, type: 3} +--- !u!1001 &4742363868994068291 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4742363870248418081, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_Name + value: FireHydrant_0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalPosition.x + value: 2.3972616 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalPosition.y + value: -2.3957255 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4742363870248418085, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bbe6a31f746412142b22ccb6e411c98c, type: 3} diff --git a/MuseumGame/Assets/Scripts/EnemyProjectile.cs b/MuseumGame/Assets/Scripts/EnemyProjectile.cs index a91c5b7..09b5a50 100644 --- a/MuseumGame/Assets/Scripts/EnemyProjectile.cs +++ b/MuseumGame/Assets/Scripts/EnemyProjectile.cs @@ -4,10 +4,13 @@ using UnityEngine; public class EnemyProjectile : MonoBehaviour { + + public float lifeSpan; + // Start is called before the first frame update void Start() { - + StartCoroutine(DestroyProjectile()); } // Update is called once per frame @@ -28,4 +31,9 @@ public class EnemyProjectile : MonoBehaviour Destroy(gameObject); } } + IEnumerator DestroyProjectile() + { + yield return new WaitForSeconds(lifeSpan); + Destroy(gameObject); + } } diff --git a/MuseumGame/Assets/Scripts/FireHydrant.cs b/MuseumGame/Assets/Scripts/FireHydrant.cs new file mode 100644 index 0000000..f03e48f --- /dev/null +++ b/MuseumGame/Assets/Scripts/FireHydrant.cs @@ -0,0 +1,46 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FireHydrant : MonoBehaviour +{ + + public GameObject projectile; + public int projSpeed; + public float timeBetween; + private Animator animator; + + // Start is called before the first frame update + void Start() + { + animator = GetComponent(); + StartCoroutine(SpawnProjectiles()); + } + + // Update is called once per frame + void Update() + { + + } + + IEnumerator SpawnProjectiles() + { + for (; ; ) + { + animator.SetBool("Firing", true); + yield return new WaitForSeconds(1f); + + for (int i = 0; i < 3; i++) + { + GameObject clone = Instantiate(projectile, transform.position, transform.rotation); + clone.transform.Rotate(new Vector3(0, 0, i * 90)); + clone.transform.position = new Vector3(clone.transform.position.x, clone.transform.position.y,.5f); + clone.GetComponent().velocity = clone.transform.right * projSpeed; + } + + animator.SetBool("Firing", false); + + yield return new WaitForSeconds(timeBetween); + } + } +} diff --git a/MuseumGame/Assets/Scripts/FireHydrant.cs.meta b/MuseumGame/Assets/Scripts/FireHydrant.cs.meta new file mode 100644 index 0000000..77fc488 --- /dev/null +++ b/MuseumGame/Assets/Scripts/FireHydrant.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 68d7ea05e5640cb4c9b4e853dbde77c5 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MuseumGame/Assets/Sprites/FireHydrant.png b/MuseumGame/Assets/Sprites/FireHydrant.png new file mode 100644 index 0000000..d328c43 Binary files /dev/null and b/MuseumGame/Assets/Sprites/FireHydrant.png differ diff --git a/MuseumGame/Assets/Sprites/FireHydrant.png.meta b/MuseumGame/Assets/Sprites/FireHydrant.png.meta new file mode 100644 index 0000000..0a2244a --- /dev/null +++ b/MuseumGame/Assets/Sprites/FireHydrant.png.meta @@ -0,0 +1,168 @@ +fileFormatVersion: 2 +guid: e20749d0789c86a48808ad957c8be8a1 +TextureImporter: + internalIDToNameTable: + - first: + 213: 2767316081879700064 + second: FireHydrant_0 + - first: + 213: -5296411866255841955 + second: FireHydrant_1 + 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: 64 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: FireHydrant_0 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0625aa9805b776620800000000000000 + internalID: 2767316081879700064 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: FireHydrant_1 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: d5528af187d5f76b0800000000000000 + internalID: -5296411866255841955 + 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/MuseumGame/Assets/Sprites/FireHydrantTop.png b/MuseumGame/Assets/Sprites/FireHydrantTop.png new file mode 100644 index 0000000..285aa2d Binary files /dev/null and b/MuseumGame/Assets/Sprites/FireHydrantTop.png differ diff --git a/MuseumGame/Assets/Sprites/FireHydrantTop.png.meta b/MuseumGame/Assets/Sprites/FireHydrantTop.png.meta new file mode 100644 index 0000000..24a8534 --- /dev/null +++ b/MuseumGame/Assets/Sprites/FireHydrantTop.png.meta @@ -0,0 +1,168 @@ +fileFormatVersion: 2 +guid: 3673d79a8087d434d8c0fb425852d32c +TextureImporter: + internalIDToNameTable: + - first: + 213: 239851139560492020 + second: FireHydrantTop_0 + - first: + 213: 2832624808901054014 + second: FireHydrantTop_1 + 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: 64 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: FireHydrantTop_0 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 4fbc974375f145300800000000000000 + internalID: 239851139560492020 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: FireHydrantTop_1 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 64 + height: 64 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: e3e818c71418f4720800000000000000 + internalID: 2832624808901054014 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: