From de5d4e34a88592a5756b077c087b4c70cbcc1f5a Mon Sep 17 00:00:00 2001 From: Kotrba Filip Date: Sat, 1 Feb 2020 22:54:57 +0100 Subject: [PATCH] commit 500 --- .../v16/Server/sqlite3/storage.ide | Bin 1265664 -> 1269760 bytes Assets/Prefabs/Barricade.prefab | 181 +- Assets/Prefabs/BarricadeField.prefab | 2 +- Assets/Prefabs/Player.prefab | 256 +- Assets/Prefabs/camp_fire.prefab | 15 +- Assets/Prefabs/door.prefab | 2 +- Assets/Scenes/Test-Haitem.unity | 10097 +++++++++++++++- Assets/Scripts/BlockManager.cs | 17 + Assets/Scripts/EnemyManager.cs | 26 +- Assets/Scripts/GuiManager.cs | 6 +- Assets/Scripts/NightDayParticles.cs | 43 + Assets/Scripts/NightDayParticles.cs.meta | 11 + Assets/Scripts/PlayerManager.cs | 48 +- Assets/Scripts/WeaponManager.cs | 14 +- Assets/Sprites/Icons/Spikes.png.meta | 68 +- ProjectSettings/TagManager.asset | 1 + 16 files changed, 10309 insertions(+), 478 deletions(-) create mode 100644 Assets/Scripts/NightDayParticles.cs create mode 100644 Assets/Scripts/NightDayParticles.cs.meta diff --git a/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide b/.vs/GlobalGameJame/v16/Server/sqlite3/storage.ide index 14bf81498c802d3415f89ba555d3f1fdbaf39ed4..a1bedcfcdac05edf8c64345fc2901790e9d2322b 100644 GIT binary patch delta 8125 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 delta 4843 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 + if (enemyManager != null) + { + enemyManager.Damage(100); + health = 0; + Destroy(this.gameObject, 3); + } + } + } + } } diff --git a/Assets/Scripts/EnemyManager.cs b/Assets/Scripts/EnemyManager.cs index 348a65e..534276f 100644 --- a/Assets/Scripts/EnemyManager.cs +++ b/Assets/Scripts/EnemyManager.cs @@ -47,7 +47,7 @@ public class EnemyManager : MonoBehaviour void FixedUpdate() { - if (navMeshAgent.pathStatus == NavMeshPathStatus.PathComplete) + if (navMeshAgent != null && navMeshAgent.pathStatus == NavMeshPathStatus.PathComplete) { if (actualHealth > 0 && barricadeManager == null) { @@ -64,11 +64,17 @@ public class EnemyManager : MonoBehaviour } } - public void Damage() + public void Damage(float damageLoc = 0) { - WeaponManager weaponManager = player.weaponList[player.selectedWeapon].GetComponent(); - if (weaponManager != null) { - actualHealth -= weaponManager.damage; + if (damageLoc == 0) { + WeaponManager weaponManager = player.weaponList[player.selectedWeapon].GetComponent(); + if (weaponManager != null) { + actualHealth -= weaponManager.damage; + } + } + else + { + actualHealth -= damageLoc; } } @@ -153,7 +159,7 @@ public class EnemyManager : MonoBehaviour void Attack() { RaycastHit hit; - if (Physics.Raycast(transform.position + new Vector3(0,0.5f,0),transform.forward,out hit,2) && attackTime <= Time.time) + if (Physics.Raycast(transform.position + new Vector3(0,0.5f,0),transform.forward,out hit,1.5f) && attackTime <= Time.time) { if (hit.transform.CompareTag("Player")) { @@ -182,10 +188,14 @@ public class EnemyManager : MonoBehaviour void OnTriggerEnter(Collider collider) { + Debug.Log(collider.transform.tag); if (collider.transform.CompareTag("Meele")) { - Damage(); - + WeaponManager weaponManager = collider.transform.GetComponent(); + if (weaponManager != null && weaponManager.hit) { + Damage(); + weaponManager.hit = false; + } } } } diff --git a/Assets/Scripts/GuiManager.cs b/Assets/Scripts/GuiManager.cs index 6992e7e..65c5468 100644 --- a/Assets/Scripts/GuiManager.cs +++ b/Assets/Scripts/GuiManager.cs @@ -21,8 +21,12 @@ public class GuiManager : MonoBehaviour } - public void InteractVerifier(bool set) + public void InteractVerifier(bool set, Sprite image = null) { InteractIcon.SetActive(set); + if (image != null) + { + InteractIcon.GetComponent().sprite = image; + } } } diff --git a/Assets/Scripts/NightDayParticles.cs b/Assets/Scripts/NightDayParticles.cs new file mode 100644 index 0000000..af7c593 --- /dev/null +++ b/Assets/Scripts/NightDayParticles.cs @@ -0,0 +1,43 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class NightDayParticles : MonoBehaviour +{ + public GameObject parentParticle; + public bool activeInDay = false; + public bool activeInNight = false; + public DayManager dayManager; + bool night = false; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + float sunRotationX = dayManager.transform.localEulerAngles.x; + sunRotationX = (sunRotationX > 180) ? sunRotationX - 360 : sunRotationX; + + if (sunRotationX < 0 && !night) + { + night = true; + } + else if (sunRotationX > 0 && night) + { + night = false; + } + + if ((activeInDay && !night) || (activeInNight && night)) + { + parentParticle.SetActive(true); + } + else + { + parentParticle.SetActive(false); + } + } +} diff --git a/Assets/Scripts/NightDayParticles.cs.meta b/Assets/Scripts/NightDayParticles.cs.meta new file mode 100644 index 0000000..1fe1123 --- /dev/null +++ b/Assets/Scripts/NightDayParticles.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b0314a14d6c40f643bdaaf2fb3e0228d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerManager.cs b/Assets/Scripts/PlayerManager.cs index 32738ab..4d53e91 100644 --- a/Assets/Scripts/PlayerManager.cs +++ b/Assets/Scripts/PlayerManager.cs @@ -21,6 +21,9 @@ public class PlayerManager : MonoBehaviour public int ammo = 50; public List weaponList = new List(); private GameObject createWeapon; + public GameObject spikes; + public Sprite spikesImage; + public Sprite handImage; public GuiManager guiManager; public int selectedWeapon = 0; private float selectRate = 1; @@ -47,7 +50,6 @@ public class PlayerManager : MonoBehaviour Move(); RunSwitch(); SelectWeapon(); - BuildBlock(); Interact(); if (actualHealth <= 0) @@ -178,36 +180,30 @@ public class PlayerManager : MonoBehaviour } } - void BuildBlock () - { - if (Input.GetAxisRaw("Fire1") > 0 && buildTime < Time.time && weaponList.Count > 0) - { - Ray ray = playerCamera.ScreenPointToRay(Input.mousePosition); - RaycastHit hit; - if (Physics.Raycast(ray, out hit, Mathf.Infinity, LayerMask.GetMask("BuildPlace"))) - { - BlockManager blockManager = weaponList[selectedWeapon].GetComponent(); - if (blockManager != null) { - Instantiate(weaponList[selectedWeapon], hit.point, transform.rotation); - buildTime = buildRate + Time.time; - } - } - } - } - void Interact() { Ray ray = playerCamera.ScreenPointToRay(Input.mousePosition); RaycastHit hit; if (Physics.Raycast(ray, out hit, 2)) { - if (hit.transform.CompareTag("BarricadeField") || hit.transform.CompareTag("Interact")) + if (hit.transform.CompareTag("BarricadeField") || hit.transform.CompareTag("Interact") || hit.transform.gameObject.layer == LayerMask.NameToLayer("BuildPlace")) { - guiManager.InteractVerifier(true); + BlockManager blockManager = hit.transform.GetComponent(); + if (blockManager == null || blockManager.blockType != BlockManager.BlockType.Barricade) { + guiManager.InteractVerifier(true, handImage); + if (hit.transform.gameObject.layer == LayerMask.NameToLayer("BuildPlace")) + { + guiManager.InteractVerifier(true, spikesImage); + } + } + else + { + guiManager.InteractVerifier(false, handImage); + } } else { - guiManager.InteractVerifier(false); + guiManager.InteractVerifier(false, handImage); } if (Input.GetAxisRaw("Build") > 0 && buildTime < Time.time && barricadeMaterials > 0 && hit.transform.tag == "BarricadeField") { @@ -226,7 +222,15 @@ public class PlayerManager : MonoBehaviour { BlockManager blockManager = hit.transform.GetComponent(); blockManager.Action(); - + } + else if (hit.transform.gameObject.layer == LayerMask.NameToLayer("BuildPlace") && Input.GetKeyDown(KeyCode.E) && buildTime < Time.time) + { + BlockManager blockManager = spikes.GetComponent(); + if (blockManager != null) + { + Instantiate(spikes, hit.point, transform.rotation); + buildTime = buildRate + Time.time; + } } } else diff --git a/Assets/Scripts/WeaponManager.cs b/Assets/Scripts/WeaponManager.cs index 5adbdd2..e460950 100644 --- a/Assets/Scripts/WeaponManager.cs +++ b/Assets/Scripts/WeaponManager.cs @@ -47,19 +47,15 @@ public class WeaponManager : MonoBehaviour } else if (weaponType == WeaponType.Meele) { + hit = true; animator.ResetTrigger("Hit"); animator.SetTrigger("Hit"); fireTime = fireRate + Time.time; } } - } - void Hit_Enemy_Start() - { - hit = true; - } - - void Hit_Enemy_End() - { - hit = false; + if (fireTime <= Time.time) + { + hit = false; + } } } diff --git a/Assets/Sprites/Icons/Spikes.png.meta b/Assets/Sprites/Icons/Spikes.png.meta index bbf83da..aae4ec1 100644 --- a/Assets/Sprites/Icons/Spikes.png.meta +++ b/Assets/Sprites/Icons/Spikes.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 10 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -31,16 +31,16 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 0 aniso: -1 mipBias: -100 - wrapU: -1 - wrapV: -1 - wrapW: -1 - nPOTScale: 1 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 @@ -49,9 +49,9 @@ TextureImporter: spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 - alphaIsTransparency: 0 + alphaIsTransparency: 1 spriteTessellationDetail: -1 - textureType: 0 + textureType: 8 textureShape: 1 singleChannelComponent: 0 maxTextureSizeSet: 0 @@ -70,13 +70,61 @@ TextureImporter: 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: Windows Store Apps + 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: Android + 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: [] outline: [] physicsShape: [] bones: [] - spriteID: + spriteID: 5e97eb03825dee720800000000000000 internalID: 0 vertices: [] indices: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index aff0781..ecf8239 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -9,6 +9,7 @@ TagManager: - Enemy - Interact - Meele + - Spikes layers: - Default - TransparentFX