From f3f556f9a4a1b96e2f4808089325eef6fce412d3 Mon Sep 17 00:00:00 2001 From: Matthew Kalahiki Date: Tue, 4 May 2021 16:22:55 -0500 Subject: [PATCH] start of winter --- MuseumGame/Assets/Scenes/MainMenu.unity | 4 +- .../Assets/Scenes/Winter/WinterBoss.unity | 351 +++++++++++++++++- MuseumGame/Assets/Scripts/SnowBoss.cs | 79 +++- .../ProjectSettings/EditorBuildSettings.asset | 3 + .../UserSettings/EditorUserSettings.asset | 11 +- 5 files changed, 435 insertions(+), 13 deletions(-) diff --git a/MuseumGame/Assets/Scenes/MainMenu.unity b/MuseumGame/Assets/Scenes/MainMenu.unity index 8086266..92e5e6e 100644 --- a/MuseumGame/Assets/Scenes/MainMenu.unity +++ b/MuseumGame/Assets/Scenes/MainMenu.unity @@ -4008,8 +4008,8 @@ MonoBehaviour: shrinkPowerupButton: {fileID: 974869911} otherPowerupButton: {fileID: 847247611} powerupText: {fileID: 829770868} - sceneToLoad: DogTunnel - positionToLoad: {x: 15.422754, y: -3.08, z: 0} + sceneToLoad: WinterBoss + positionToLoad: {x: 0, y: 0, z: 0} music: - {fileID: 8300000, guid: f29919963390ff24fa1ae468277b309e, type: 3} - {fileID: 8300000, guid: 327636dbdcb895b478ac95086f383d8a, type: 3} diff --git a/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity b/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity index b049d57..27cc2d5 100644 --- a/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity +++ b/MuseumGame/Assets/Scenes/Winter/WinterBoss.unity @@ -134,6 +134,7 @@ GameObject: - component: {fileID: 610815863} - component: {fileID: 610815865} - component: {fileID: 610815864} + - component: {fileID: 610815866} m_Layer: 0 m_Name: floor m_TagString: Untagged @@ -211,17 +212,221 @@ Tilemap: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610815862} m_Enabled: 1 - m_Tiles: {} + m_Tiles: + - first: {x: -9, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -8, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -7, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -6, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -5, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -4, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -3, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 2, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: -5, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} - m_TileAssetArray: [] - m_TileSpriteArray: [] - m_TileMatrixArray: [] - m_TileColorArray: [] + m_TileAssetArray: + - m_RefCount: 18 + m_Data: {fileID: 11400000, guid: bf68833136a385e4590643b54b8cdb59, type: 2} + m_TileSpriteArray: + - m_RefCount: 18 + m_Data: {fileID: -944286320327052877, guid: a0dd1586ee2f27a44999b4d33c36ba46, type: 3} + m_TileMatrixArray: + - m_RefCount: 18 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 18 + m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Origin: {x: 0, y: 0, z: 0} - m_Size: {x: 0, y: 0, z: 1} + m_Origin: {x: -9, y: -5, z: 0} + m_Size: {x: 18, y: 5, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -241,6 +446,22 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!19719996 &610815866 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610815862} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0.00001 --- !u!1 &670418650 GameObject: m_ObjectHideFlags: 0 @@ -296,6 +517,7 @@ GameObject: - component: {fileID: 1441932953} - component: {fileID: 1441932952} - component: {fileID: 1441932951} + - component: {fileID: 1441932954} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -368,3 +590,118 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1441932954 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1441932950} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2bd046d4caeda4b4b8fcb2e33e4d83c8, type: 3} + m_Name: + m_EditorClassIdentifier: + boundaryPercent: 0.25 + easing: 0.01 +--- !u!1 &2078950680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2078950683} + - component: {fileID: 2078950682} + - component: {fileID: 2078950681} + m_Layer: 0 + m_Name: SnowBoss + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2078950681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2078950680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52149e6b1466fd2489f9810f6aade74d, type: 3} + m_Name: + m_EditorClassIdentifier: + projectile: {fileID: 5836429411335034028, guid: 67bd739b3855bf4449e02e4b83c1d984, type: 3} + projSpeed: 20 + firerate: 4 + size: 4 + damageTaken: 10 + doors: [] +--- !u!212 &2078950682 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2078950680} + 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: 7482667652216324306, guid: db750325989564987a34393247d883b4, 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!4 &2078950683 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2078950680} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 6.78, y: -1.35, z: 0} + m_LocalScale: {x: 3.9171927, y: 4.9918237, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/MuseumGame/Assets/Scripts/SnowBoss.cs b/MuseumGame/Assets/Scripts/SnowBoss.cs index bd4ea7d..b48675e 100644 --- a/MuseumGame/Assets/Scripts/SnowBoss.cs +++ b/MuseumGame/Assets/Scripts/SnowBoss.cs @@ -4,15 +4,90 @@ using UnityEngine; public class SnowBoss : MonoBehaviour { + + public GameObject projectile; + public int projSpeed; + public float firerate; + public float size; + + private GameObject enemyHealthBar; + private EnemyHealthBar ehb; + private int enemyHealth; + public int damageTaken; + public GameObject[] doors; + // Start is called before the first frame update void Start() { - + StartCoroutine(SpawnProjectiles()); + + enemyHealthBar = GameManager.Instance.GetEnemyHealthBar(); + ehb = enemyHealthBar.GetComponent(); + enemyHealthBar.gameObject.SetActive(true); + enemyHealth = ehb.maxHealth; + foreach (GameObject i in doors) + { + i.GetComponent().isTrigger = false; + i.GetComponent().enabled = false; + } + + } // Update is called once per frame void Update() { - + + } + public void DamageEnemy(int damage) + { + enemyHealth -= damage; + ehb.SetHealth(enemyHealth); + if (enemyHealth <= 0) + { + enemyHealthBar.SetActive(false); + foreach (GameObject i in doors) + { + i.GetComponent().isTrigger = true; + i.GetComponent().enabled = true; + } + Destroy(gameObject); + } + + } + void OnCollisionEnter2D(Collision2D collision2D) + { + + if (collision2D.gameObject.CompareTag("Player")) + { + DamageEnemy(damageTaken); + } + + } + void OnTriggerEnter2D(Collider2D collider2D) + { + if (collider2D.gameObject.CompareTag("Player")) + { + DamageEnemy(damageTaken); + } + } + + IEnumerator SpawnProjectiles() + { + for (; ; ) + { + + + yield return new WaitForSeconds(1 / firerate); + + GameObject clone = Instantiate(projectile, transform.position, transform.rotation); + clone.transform.localScale = new Vector3(size, size, 0); + clone.transform.Rotate(new Vector3(0, 0, 180)); + clone.GetComponent().velocity = clone.transform.right * projSpeed; + + + + } } + } diff --git a/MuseumGame/ProjectSettings/EditorBuildSettings.asset b/MuseumGame/ProjectSettings/EditorBuildSettings.asset index a22f0c5..8bb1700 100644 --- a/MuseumGame/ProjectSettings/EditorBuildSettings.asset +++ b/MuseumGame/ProjectSettings/EditorBuildSettings.asset @@ -44,6 +44,9 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/DogLevel/NewDogSpawn.unity guid: 1c28d00a557254e3190c3e183bf6c295 + - enabled: 1 + path: Assets/Scenes/Winter/WinterBoss.unity + guid: 26926253d0f25404ca3bb3b2ac323d5d - enabled: 1 path: Assets/Scenes/DogLevel/DogTunnel.unity guid: 364cd064779a8433fa06f589ff076342 diff --git a/MuseumGame/UserSettings/EditorUserSettings.asset b/MuseumGame/UserSettings/EditorUserSettings.asset index a30ac6c..9f97905 100644 --- a/MuseumGame/UserSettings/EditorUserSettings.asset +++ b/MuseumGame/UserSettings/EditorUserSettings.asset @@ -7,30 +7,37 @@ EditorUserSettings: m_ConfigSettings: RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620c1336eff9002dece933e5a92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 flags: 0 RecentlyUsedScenePath-1: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a2362191c27ead43b1aedf425a7f234362820 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 flags: 0 RecentlyUsedScenePath-2: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621b1226f6e50037d6e821ecf5742a323016f6 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b flags: 0 RecentlyUsedScenePath-3: value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d32f5ee7a2decee22f0 + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621a0d3ae9e5740be1e238eca92f31352d1b + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23621d1224e7f27a2decee22f0 + value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3f3cf1f37a2decee22f0 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e3136f4e5380bf2e621e7a92f31352d1b + value: 22424703114646680e0b0227036c720505120d2763053323283c107df7ee3d2cfb flags: 0 RecentlyUsedScenePath-7: value: 22424703114646680e0b0227036c72111f19352f223d68252320092a + value: 22424703114646680e0b0227036c7b151b18342f3a2d2a23620b1220f1d23b37efa923e7ee2e26 flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c7b1f113b1d3c2924691e283e393ce5d32439f5e978fce9332b25 + value: 22424703114646680e0b0227036c72111f19352f223d68252320092a flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c7b1f113b1d3c29246914222e2926ecee3134acf238e0f323