diff --git a/Assets/Prefabs/PatronCoolGuy.prefab b/Assets/Prefabs/PatronCoolGuy.prefab index e433ae4..7a1869a 100644 --- a/Assets/Prefabs/PatronCoolGuy.prefab +++ b/Assets/Prefabs/PatronCoolGuy.prefab @@ -13,6 +13,7 @@ GameObject: - 54: {fileID: 5400000} - 136: {fileID: 13600000} - 114: {fileID: 11400000} + - 82: {fileID: 8200000} m_Layer: 0 m_Name: PatronCoolGuy m_TagString: Untagged @@ -75,6 +76,64 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!82 &8200000 +AudioSource: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + serializedVersion: 3 + m_audioClip: {fileID: 8300000, guid: d67f8f47c42e54a8482fe86b8c35533e, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!95 &9500000 Animator: serializedVersion: 2 diff --git a/Assets/Prefabs/VV Aura.prefab b/Assets/Prefabs/VV Aura.prefab index 3a244ee..b98cf73 100644 --- a/Assets/Prefabs/VV Aura.prefab +++ b/Assets/Prefabs/VV Aura.prefab @@ -12,6 +12,7 @@ GameObject: - 136: {fileID: 13600000} - 23: {fileID: 2300000} - 114: {fileID: 11400000} + - 82: {fileID: 8200000} m_Layer: 0 m_Name: VV Aura m_TagString: VVAura @@ -58,6 +59,64 @@ MeshFilter: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100000} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!82 &8200000 +AudioSource: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 100000} + m_Enabled: 1 + serializedVersion: 3 + m_audioClip: {fileID: 8300000, guid: 416df2cebd3aa4ac98e85ac3e3c3b99a, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + - time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 --- !u!114 &11400000 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 625a925..ce709bf 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1861,59 +1861,6 @@ SpriteRenderer: m_SortingLayerID: 0 m_Sprite: {fileID: 21300000, guid: 378f31aba1740b845811779db7058afe, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} ---- !u!1 &1140506734 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 100004, guid: 344553ed180b2de4780a5f09becb7645, type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 1140506737} - - 135: {fileID: 1140506736} - - 114: {fileID: 1140506735} - m_Layer: 0 - m_Name: nav3 - m_TagString: pois - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1140506735 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11400002, guid: 344553ed180b2de4780a5f09becb7645, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1140506734} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 79de31dde1348491f8c7da34e162f0e7, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!135 &1140506736 -SphereCollider: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 13500002, guid: 344553ed180b2de4780a5f09becb7645, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1140506734} - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: .5 - m_Center: {x: 0, y: 0, z: 0} ---- !u!4 &1140506737 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 400004, guid: 344553ed180b2de4780a5f09becb7645, type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1140506734} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 15.6433258, y: .274641037, z: 9.0915699} - m_LocalScale: {x: 1.93007195, y: 1.93007195, z: 1.93007195} - m_Children: [] - m_Father: {fileID: 0} --- !u!1 &1164596948 GameObject: m_ObjectHideFlags: 0 @@ -1941,7 +1888,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cc84b14a55660b643805ae0f1878c40b, type: 3} m_Name: m_EditorClassIdentifier: - swigs: 1 + swigs: 10 swigText: {fileID: 493161367} scoreText: {fileID: 621151321} maxPatrons: 10 @@ -3206,7 +3153,7 @@ AudioSource: serializedVersion: 3 m_audioClip: {fileID: 8300000, guid: 38bfc99e65cfc8f4bb53f50021693720, type: 3} m_PlayOnAwake: 1 - m_Volume: .100000001 + m_Volume: .0500000007 m_Pitch: 1 Loop: 1 Mute: 0 diff --git a/Assets/Scripts/Patron.cs b/Assets/Scripts/Patron.cs index bf34d5e..8be5c83 100644 --- a/Assets/Scripts/Patron.cs +++ b/Assets/Scripts/Patron.cs @@ -24,7 +24,10 @@ public class Patron : MonoBehaviour { if (other.tag == "Shank") { //Instantiate (playerExplosion, other.transform.position, other.transform.rotation); + //gameObject.audio.Play (); Destroy(gameObject); + + if(isDemon) gameController.AddScore (); else diff --git a/Assets/Sprites/Animation/poser3_walk.controller b/Assets/Sprites/Animation/poser3_controller.controller similarity index 98% rename from Assets/Sprites/Animation/poser3_walk.controller rename to Assets/Sprites/Animation/poser3_controller.controller index f095007..0dc36e6 100644 --- a/Assets/Sprites/Animation/poser3_walk.controller +++ b/Assets/Sprites/Animation/poser3_controller.controller @@ -5,7 +5,7 @@ AnimatorController: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_Name: poser3_walk + m_Name: poser3_controller serializedVersion: 2 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/Sprites/Animation/poser3_walk.controller.meta b/Assets/Sprites/Animation/poser3_controller.controller.meta similarity index 100% rename from Assets/Sprites/Animation/poser3_walk.controller.meta rename to Assets/Sprites/Animation/poser3_controller.controller.meta diff --git a/Assets/Sprites/Materials/brickwal-not-animatedl0.mat b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat index 3b9a9ab..089d98c 100644 --- a/Assets/Sprites/Materials/brickwal-not-animatedl0.mat +++ b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat @@ -19,7 +19,7 @@ Material: second: m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3} m_Scale: {x: 1, y: .5} - m_Offset: {x: 0, y: .5} + m_Offset: {x: 0, y: 0} data: first: name: _BumpMap diff --git a/Assets/Sprites/demon-head.png.meta b/Assets/Sprites/demon-head.png.meta index e496db6..e0374c8 100644 --- a/Assets/Sprites/demon-head.png.meta +++ b/Assets/Sprites/demon-head.png.meta @@ -4,7 +4,7 @@ TextureImporter: serializedVersion: 2 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 linearTexture: 0 correctGamma: 0 fadeOut: 0 @@ -20,24 +20,24 @@ TextureImporter: grayScaleToAlpha: 0 generateCubemap: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: -3 maxTextureSize: 1024 textureSettings: - filterMode: -1 - aniso: -1 + filterMode: 0 + aniso: 1 mipBias: -1 - wrapMode: -1 - nPOTScale: 1 + wrapMode: 1 + nPOTScale: 0 lightmap: 0 compressionQuality: 50 - spriteMode: 0 + spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 alignment: 0 spritePivot: {x: .5, y: .5} spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 + alphaIsTransparency: 1 + textureType: 8 buildTargetSettings: [] spriteSheet: sprites: []