diff --git a/Assets/Enemies/Bringer of Death/Bringer of Death.prefab b/Assets/Enemies/Bringer of Death/Bringer of Death.prefab index b338cd0..a4dfdee 100644 --- a/Assets/Enemies/Bringer of Death/Bringer of Death.prefab +++ b/Assets/Enemies/Bringer of Death/Bringer of Death.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 2411932740123829751} m_Layer: 6 m_Name: Bringer of Death - m_TagString: Ennemy + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -193,7 +193,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4b3c6920a262c94696eed7deeec570f, type: 3} m_Name: m_EditorClassIdentifier: + Life: 1000 Speed: 1 Damages: 100 - Life: 1000 _orb: {fileID: 4247841200454641178, guid: 5f995817aeb7ddc4e841633e73c7ff59, type: 3} diff --git a/Assets/Enemies/Ennemy.cs b/Assets/Enemies/Enemy.cs similarity index 99% rename from Assets/Enemies/Ennemy.cs rename to Assets/Enemies/Enemy.cs index 9855974..ab1c0ce 100644 --- a/Assets/Enemies/Ennemy.cs +++ b/Assets/Enemies/Enemy.cs @@ -6,7 +6,7 @@ using UnityEngine; RequireComponent(typeof(Animator)), RequireComponent(typeof(BoxCollider2D)) ] -public class Ennemy : MonoBehaviour +public class Enemy : MonoBehaviour { private SpriteRenderer _sr; private Transform _player; diff --git a/Assets/Enemies/Ennemy.cs.meta b/Assets/Enemies/Enemy.cs.meta similarity index 100% rename from Assets/Enemies/Ennemy.cs.meta rename to Assets/Enemies/Enemy.cs.meta diff --git a/Assets/Enemies/Mayor/Mayor.prefab b/Assets/Enemies/Mayor/Mayor.prefab index 67cdeb8..d2cf30d 100644 --- a/Assets/Enemies/Mayor/Mayor.prefab +++ b/Assets/Enemies/Mayor/Mayor.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 5118712594196875348} m_Layer: 6 m_Name: Mayor - m_TagString: Ennemy + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -121,9 +121,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4b3c6920a262c94696eed7deeec570f, type: 3} m_Name: m_EditorClassIdentifier: + Life: 100 Speed: 0.2 Damages: 10 - Life: 100 _orb: {fileID: 4247841200454641178, guid: 5f995817aeb7ddc4e841633e73c7ff59, type: 3} --- !u!61 &247299863115505385 BoxCollider2D: diff --git a/Assets/Enemies/Minautor/Minautor.prefab b/Assets/Enemies/Minautor/Minautor.prefab index 841c085..b779c74 100644 --- a/Assets/Enemies/Minautor/Minautor.prefab +++ b/Assets/Enemies/Minautor/Minautor.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 5506280093993411831} m_Layer: 6 m_Name: Minautor - m_TagString: Ennemy + m_TagString: Enemy m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -193,7 +193,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4b3c6920a262c94696eed7deeec570f, type: 3} m_Name: m_EditorClassIdentifier: + Life: 500 Speed: 0.7 Damages: 75 - Life: 500 _orb: {fileID: 4247841200454641178, guid: 5f995817aeb7ddc4e841633e73c7ff59, type: 3} diff --git a/Assets/Player/Scripts/Spawner.cs b/Assets/Player/Scripts/Spawner.cs index 74a62a7..14f148d 100644 --- a/Assets/Player/Scripts/Spawner.cs +++ b/Assets/Player/Scripts/Spawner.cs @@ -36,9 +36,9 @@ public class Spawner : MonoBehaviour private void Update() { - _spawnedMayors = Array.FindAll(GameObject.FindGameObjectsWithTag("Ennemy"), (value) => value.name.Contains("Mayor")).Length; - _spawnedMinautor = Array.FindAll(GameObject.FindGameObjectsWithTag("Ennemy"), (value) => value.name.Contains("Minautor")).Length; - _spawnedBringerOfDeath = Array.FindAll(GameObject.FindGameObjectsWithTag("Ennemy"), (value) => value.name.Contains("Bringer of Death")).Length; + _spawnedMayors = Array.FindAll(GameObject.FindGameObjectsWithTag("Enemy"), (value) => value.name.Contains("Mayor")).Length; + _spawnedMinautor = Array.FindAll(GameObject.FindGameObjectsWithTag("Enemy"), (value) => value.name.Contains("Minautor")).Length; + _spawnedBringerOfDeath = Array.FindAll(GameObject.FindGameObjectsWithTag("Enemy"), (value) => value.name.Contains("Bringer of Death")).Length; } private void SpawnWave() diff --git a/Assets/Weapons/Arrow/Arrow.cs b/Assets/Weapons/Arrow/Arrow.cs index 3428b96..d5b9cc0 100644 --- a/Assets/Weapons/Arrow/Arrow.cs +++ b/Assets/Weapons/Arrow/Arrow.cs @@ -23,10 +23,10 @@ public class Arrow : MonoBehaviour private void OnTriggerEnter2D(Collider2D collision) { - if (collision.CompareTag("Ennemy")) + if (collision.CompareTag("Enemy")) { - collision.gameObject.GetComponent().Life -= _manager.ArrowDamages; - collision.gameObject.GetComponent().AnimateHit(); + collision.gameObject.GetComponent().Life -= _manager.ArrowDamages; + collision.gameObject.GetComponent().AnimateHit(); Destroy(gameObject); } diff --git a/Assets/Weapons/Arrow/Arrow.prefab b/Assets/Weapons/Arrow/Arrow.prefab index e6f50d8..89e91fe 100644 --- a/Assets/Weapons/Arrow/Arrow.prefab +++ b/Assets/Weapons/Arrow/Arrow.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 1122248669417151642} m_Layer: 0 m_Name: Arrow - m_TagString: Ennemy + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -143,5 +143,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 07290ccb39a0b6f4b9054a0ddfbf0010, type: 3} m_Name: m_EditorClassIdentifier: - Damages: 10 - target: {fileID: 0} + Target: {fileID: 0} diff --git a/Assets/Weapons/Beam/Beam.cs b/Assets/Weapons/Beam/Beam.cs index 13f9a07..f5d19a3 100644 --- a/Assets/Weapons/Beam/Beam.cs +++ b/Assets/Weapons/Beam/Beam.cs @@ -33,17 +33,17 @@ public class Beam : MonoBehaviour private void OnTriggerEnter2D(Collider2D collision) { - if (collision.CompareTag("Ennemy")) + if (collision.CompareTag("Enemy")) { - collision.gameObject.GetComponent().AnimateHit(); + collision.gameObject.GetComponent().AnimateHit(); } } private void OnTriggerStay2D(Collider2D collision) { - if (collision.CompareTag("Ennemy")) + if (collision.CompareTag("Enemy")) { - collision.gameObject.GetComponent().Life -= (int)(_manager.BeamDamages * Time.deltaTime); + collision.gameObject.GetComponent().Life -= (int)(_manager.BeamDamages * Time.deltaTime); } } diff --git a/Assets/Weapons/Sword Halo/Sword.cs b/Assets/Weapons/Sword Halo/Sword.cs index 3a2df5d..b792dc4 100644 --- a/Assets/Weapons/Sword Halo/Sword.cs +++ b/Assets/Weapons/Sword Halo/Sword.cs @@ -30,10 +30,10 @@ public class Sword : MonoBehaviour private void OnTriggerEnter2D(Collider2D collision) { - if (collision.CompareTag("Ennemy") && collision.gameObject != null) + if (collision.CompareTag("Enemy") && collision.gameObject != null) { - collision.GetComponent().Life -= _manager.SwordsDamages; - collision.gameObject.GetComponent().AnimateHit(); + collision.GetComponent().Life -= _manager.SwordsDamages; + collision.gameObject.GetComponent().AnimateHit(); } } } diff --git a/Assets/icon.png b/Assets/icon.png new file mode 100644 index 0000000..a1ce9d2 Binary files /dev/null and b/Assets/icon.png differ diff --git a/Assets/icon.png.meta b/Assets/icon.png.meta new file mode 100644 index 0000000..ab24719 --- /dev/null +++ b/Assets/icon.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e7b29201e6fec474b929b023e47d5081 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 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 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 26637ae..96d3aa7 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: Ynov - productName: Vampire Survivor + companyName: "L'\xC9picierie" + productName: Vampire Survivor Replica defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -40,7 +40,7 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_VirtualRealitySplashScreen: {fileID: 0} + m_VirtualRealitySplashScreen: {fileID: 2800000, guid: e7b29201e6fec474b929b023e47d5081, type: 3} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1920 defaultScreenHeight: 1080 @@ -156,7 +156,7 @@ PlayerSettings: androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: - Standalone: com.DefaultCompany.2DProject + Standalone: fr.LEpicerie.VampireSurvivor buildNumber: Standalone: 0 VisionOS: 0 @@ -277,7 +277,14 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: e7b29201e6fec474b929b023e47d5081, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetShaderSettings: [] @@ -566,8 +573,8 @@ PlayerSettings: ps4IncludedModules: [] ps4attribVROutputEnabled: 0 monoEnv: - splashScreenBackgroundSourceLandscape: {fileID: 0} - splashScreenBackgroundSourcePortrait: {fileID: 0} + splashScreenBackgroundSourceLandscape: {fileID: 21300000, guid: e7b29201e6fec474b929b023e47d5081, type: 3} + splashScreenBackgroundSourcePortrait: {fileID: 21300000, guid: e7b29201e6fec474b929b023e47d5081, type: 3} blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 32 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 64bbda6..37e2b03 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,8 +5,8 @@ TagManager: serializedVersion: 2 tags: - Orb - - Ennemy - Beam + - Enemy layers: - Default - TransparentFX diff --git a/README.md b/README.md index 52135c9..caf2c2f 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The player win after 15 minutes. - 3 differents attacks: - A temporary laser beam - A swords halo around the player - - An arrow that shoot the nearest ennemy + - An arrow that shoot the nearest enemy - Enemies - Differents specs (speed, health, damage) - Spawn randomly outside the player screen all along the game