From 78e42c158c2536389ae95beeb6f20fd98835ee6d Mon Sep 17 00:00:00 2001 From: shakurass Date: Sat, 26 Apr 2014 18:16:21 -0600 Subject: [PATCH] Added textures and drinking mechanics. --- Assets/Audio/demon-kill.wav.meta | 12 ++ Assets/Audio/demon-spotted.wav.meta | 12 ++ Assets/Audio/drink-elixer.wav.meta | 12 ++ Assets/Audio/nope.wav.meta | 12 ++ Assets/Audio/shank.wav.meta | 12 ++ Assets/Audio/walk.wav.meta | 12 ++ Assets/Audio/wrong-stab.wav.meta | 12 ++ Assets/Materials.meta | 5 + .../{Prefabs => Materials}/AuraMaterial.mat | 0 .../AuraMaterial.mat.meta | 0 Assets/{ => Materials}/Evil Material.mat | 0 Assets/{ => Materials}/Evil Material.mat.meta | 0 Assets/{ => Materials}/Neutral Material.mat | 0 .../{ => Materials}/Neutral Material.mat.meta | 0 .../Materials/demon-hero-walk-1.mat | 0 .../Materials/demon-hero-walk-1.mat.meta | 0 Assets/North Wall.controller | 53 ++++++ Assets/North Wall.controller.meta | 4 + Assets/Prefabs/Shanking Detector.prefab | 61 ++++++- Assets/Prefabs/VV Aura.prefab | 2 +- Assets/Scenes/Main.unity | 154 ++++++++++++++++-- Assets/Scripts/PlayerController.cs | 6 +- .../Materials/brickwal-not-animatedl0.mat | 28 ++++ .../brickwal-not-animatedl0.mat.meta | 4 + Assets/Sprites/Materials/brickwall.mat | 28 ++++ Assets/Sprites/Materials/brickwall.mat.meta | 4 + Assets/Sprites/Materials/floor.mat | 28 ++++ Assets/Sprites/Materials/floor.mat.meta | 4 + .../Sprites/brickwal-not-animatedl0.png.meta | 45 +++++ .../Sprites/brickwal-not-animatedl1.png.meta | 45 +++++ Assets/Sprites/brickwall.ase.meta | 4 + Assets/Sprites/brickwall.png.meta | 45 +++++ Assets/Sprites/demon-head.ase.meta | 4 + Assets/Sprites/demon-head.png.meta | 45 +++++ Assets/Sprites/demon-hero-idle.png.meta | 45 +++++ Assets/Sprites/floor.ase.meta | 4 + Assets/Sprites/floor.png.meta | 45 +++++ Assets/wall.anim | 43 +++++ Assets/wall.anim.meta | 4 + 39 files changed, 779 insertions(+), 15 deletions(-) create mode 100644 Assets/Audio/demon-kill.wav.meta create mode 100644 Assets/Audio/demon-spotted.wav.meta create mode 100644 Assets/Audio/drink-elixer.wav.meta create mode 100644 Assets/Audio/nope.wav.meta create mode 100644 Assets/Audio/shank.wav.meta create mode 100644 Assets/Audio/walk.wav.meta create mode 100644 Assets/Audio/wrong-stab.wav.meta create mode 100644 Assets/Materials.meta rename Assets/{Prefabs => Materials}/AuraMaterial.mat (100%) rename Assets/{Prefabs => Materials}/AuraMaterial.mat.meta (100%) rename Assets/{ => Materials}/Evil Material.mat (100%) rename Assets/{ => Materials}/Evil Material.mat.meta (100%) rename Assets/{ => Materials}/Neutral Material.mat (100%) rename Assets/{ => Materials}/Neutral Material.mat.meta (100%) rename Assets/{Sprites => }/Materials/demon-hero-walk-1.mat (100%) rename Assets/{Sprites => }/Materials/demon-hero-walk-1.mat.meta (100%) create mode 100644 Assets/North Wall.controller create mode 100644 Assets/North Wall.controller.meta create mode 100644 Assets/Sprites/Materials/brickwal-not-animatedl0.mat create mode 100644 Assets/Sprites/Materials/brickwal-not-animatedl0.mat.meta create mode 100644 Assets/Sprites/Materials/brickwall.mat create mode 100644 Assets/Sprites/Materials/brickwall.mat.meta create mode 100644 Assets/Sprites/Materials/floor.mat create mode 100644 Assets/Sprites/Materials/floor.mat.meta create mode 100644 Assets/Sprites/brickwal-not-animatedl0.png.meta create mode 100644 Assets/Sprites/brickwal-not-animatedl1.png.meta create mode 100644 Assets/Sprites/brickwall.ase.meta create mode 100644 Assets/Sprites/brickwall.png.meta create mode 100644 Assets/Sprites/demon-head.ase.meta create mode 100644 Assets/Sprites/demon-head.png.meta create mode 100644 Assets/Sprites/demon-hero-idle.png.meta create mode 100644 Assets/Sprites/floor.ase.meta create mode 100644 Assets/Sprites/floor.png.meta create mode 100644 Assets/wall.anim create mode 100644 Assets/wall.anim.meta diff --git a/Assets/Audio/demon-kill.wav.meta b/Assets/Audio/demon-kill.wav.meta new file mode 100644 index 0000000..9d7ff35 --- /dev/null +++ b/Assets/Audio/demon-kill.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 9f0fff09a84eda243a5ffe185157ac54 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/demon-spotted.wav.meta b/Assets/Audio/demon-spotted.wav.meta new file mode 100644 index 0000000..bf06dc2 --- /dev/null +++ b/Assets/Audio/demon-spotted.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 10da322d25203ef499b0f8c846ac45b6 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/drink-elixer.wav.meta b/Assets/Audio/drink-elixer.wav.meta new file mode 100644 index 0000000..67ed8c1 --- /dev/null +++ b/Assets/Audio/drink-elixer.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b6cbc7f6308e9ad42ba7cd5592c441c6 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/nope.wav.meta b/Assets/Audio/nope.wav.meta new file mode 100644 index 0000000..4190b42 --- /dev/null +++ b/Assets/Audio/nope.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d7244dd9e0122984fa5db17b4dde4894 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/shank.wav.meta b/Assets/Audio/shank.wav.meta new file mode 100644 index 0000000..701647d --- /dev/null +++ b/Assets/Audio/shank.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: b189fb0007b0fc148a287b20274b0b51 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/walk.wav.meta b/Assets/Audio/walk.wav.meta new file mode 100644 index 0000000..173cffd --- /dev/null +++ b/Assets/Audio/walk.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: d516ab91e28cc3f4c8643ea9bb575820 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/wrong-stab.wav.meta b/Assets/Audio/wrong-stab.wav.meta new file mode 100644 index 0000000..a3a6751 --- /dev/null +++ b/Assets/Audio/wrong-stab.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: abbd61fce65295a4a8764009855bd53e +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 0000000..050a282 --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 5ec97da98ba5e3246829680712b74590 +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Prefabs/AuraMaterial.mat b/Assets/Materials/AuraMaterial.mat similarity index 100% rename from Assets/Prefabs/AuraMaterial.mat rename to Assets/Materials/AuraMaterial.mat diff --git a/Assets/Prefabs/AuraMaterial.mat.meta b/Assets/Materials/AuraMaterial.mat.meta similarity index 100% rename from Assets/Prefabs/AuraMaterial.mat.meta rename to Assets/Materials/AuraMaterial.mat.meta diff --git a/Assets/Evil Material.mat b/Assets/Materials/Evil Material.mat similarity index 100% rename from Assets/Evil Material.mat rename to Assets/Materials/Evil Material.mat diff --git a/Assets/Evil Material.mat.meta b/Assets/Materials/Evil Material.mat.meta similarity index 100% rename from Assets/Evil Material.mat.meta rename to Assets/Materials/Evil Material.mat.meta diff --git a/Assets/Neutral Material.mat b/Assets/Materials/Neutral Material.mat similarity index 100% rename from Assets/Neutral Material.mat rename to Assets/Materials/Neutral Material.mat diff --git a/Assets/Neutral Material.mat.meta b/Assets/Materials/Neutral Material.mat.meta similarity index 100% rename from Assets/Neutral Material.mat.meta rename to Assets/Materials/Neutral Material.mat.meta diff --git a/Assets/Sprites/Materials/demon-hero-walk-1.mat b/Assets/Materials/demon-hero-walk-1.mat similarity index 100% rename from Assets/Sprites/Materials/demon-hero-walk-1.mat rename to Assets/Materials/demon-hero-walk-1.mat diff --git a/Assets/Sprites/Materials/demon-hero-walk-1.mat.meta b/Assets/Materials/demon-hero-walk-1.mat.meta similarity index 100% rename from Assets/Sprites/Materials/demon-hero-walk-1.mat.meta rename to Assets/Materials/demon-hero-walk-1.mat.meta diff --git a/Assets/North Wall.controller b/Assets/North Wall.controller new file mode 100644 index 0000000..b95410e --- /dev/null +++ b/Assets/North Wall.controller @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: North Wall + serializedVersion: 2 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 3 + m_Name: Base Layer + m_StateMachine: {fileID: 110700000} + m_Mask: {fileID: 0} + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_StateMachineMotionSetIndex: 0 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &110200000 +State: + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: wall + m_Speed: 1 + m_CycleOffset: 0 + m_Motions: + - {fileID: 7400000, guid: 549d46924b8ba044a9c93c2d141b5ce4, type: 2} + m_ParentStateMachine: {fileID: 110700000} + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_Mirror: 0 + m_Tag: +--- !u!1107 &110700000 +StateMachine: + serializedVersion: 2 + m_ObjectHideFlags: 3 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Base Layer + m_DefaultState: {fileID: 110200000} + m_States: + - {fileID: 110200000} + m_ChildStateMachine: [] + m_ChildStateMachinePosition: [] + m_OrderedTransitions: {} + m_MotionSetCount: 1 + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} diff --git a/Assets/North Wall.controller.meta b/Assets/North Wall.controller.meta new file mode 100644 index 0000000..f7c8e2b --- /dev/null +++ b/Assets/North Wall.controller.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 9bba86561c279bd49a939ba6c2758a91 +NativeFormatImporter: + userData: diff --git a/Assets/Prefabs/Shanking Detector.prefab b/Assets/Prefabs/Shanking Detector.prefab index 02c2a98..c82d37d 100644 --- a/Assets/Prefabs/Shanking Detector.prefab +++ b/Assets/Prefabs/Shanking Detector.prefab @@ -12,6 +12,7 @@ GameObject: - 65: {fileID: 6500000} - 23: {fileID: 2300000} - 114: {fileID: 11400000} + - 82: {fileID: 8200000} m_Layer: 0 m_Name: Shanking Detector m_TagString: Shank @@ -70,6 +71,64 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 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: b189fb0007b0fc148a287b20274b0b51, 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 @@ -81,7 +140,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 025a712113e797c408ae9865e9ac79c6, type: 3} m_Name: m_EditorClassIdentifier: - length: 1 + length: .300000012 --- !u!1001 &100100000 Prefab: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/VV Aura.prefab b/Assets/Prefabs/VV Aura.prefab index 07f492b..4202570 100644 --- a/Assets/Prefabs/VV Aura.prefab +++ b/Assets/Prefabs/VV Aura.prefab @@ -69,7 +69,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 025a712113e797c408ae9865e9ac79c6, type: 3} m_Name: m_EditorClassIdentifier: - length: 2 + length: 1 --- !u!136 &13600000 CapsuleCollider: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index da1f2e8..5d694c0 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -99,8 +99,8 @@ Transform: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 56874333} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: .145692825, y: 2.5, z: 10.5844784} - m_LocalScale: {x: .5, y: 5, z: 30} + m_LocalPosition: {x: .145692825, y: 2.5, z: 9.06554031} + m_LocalScale: {x: .5, y: 5, z: 12.1118956} m_Children: [] m_Father: {fileID: 1731015427} --- !u!23 &56874335 @@ -115,7 +115,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -152,6 +152,7 @@ GameObject: m_Component: - 4: {fileID: 57666823} - 65: {fileID: 57666826} + - 82: {fileID: 57666824} m_Layer: 0 m_Name: Shank Spawn m_TagString: Untagged @@ -170,6 +171,65 @@ Transform: m_LocalScale: {x: 1, y: .0909090862, z: .0500000007} m_Children: [] m_Father: {fileID: 745975992} +--- !u!82 &57666824 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 8200000, guid: 0dd5d3e41887306468e6f9dd9d58b975, + type: 2} + m_PrefabInternal: {fileID: 296847678} + m_GameObject: {fileID: 57666822} + m_Enabled: 1 + serializedVersion: 3 + m_audioClip: {fileID: 8300000, guid: b189fb0007b0fc148a287b20274b0b51, 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!65 &57666826 BoxCollider: m_ObjectHideFlags: 0 @@ -317,6 +377,7 @@ GameObject: - 4: {fileID: 146718572} - 114: {fileID: 146718573} - 54: {fileID: 146718574} + - 82: {fileID: 146718575} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -349,7 +410,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 10 - nextFire: 1 + nextFire: .5 delay: 1 shank: {fileID: 100000, guid: 0dd5d3e41887306468e6f9dd9d58b975, type: 2} playerAngle: {fileID: 745975992} @@ -371,6 +432,64 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!82 &146718575 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 146718571} + m_Enabled: 1 + serializedVersion: 3 + m_audioClip: {fileID: 8300000, guid: b189fb0007b0fc148a287b20274b0b51, 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!1001 &296847678 Prefab: m_ObjectHideFlags: 0 @@ -468,7 +587,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -867,6 +986,7 @@ GameObject: - 33: {fileID: 768198794} - 65: {fileID: 768198793} - 23: {fileID: 768198792} + - 95: {fileID: 768198795} m_Layer: 0 m_Name: North Wall m_TagString: Untagged @@ -880,7 +1000,7 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 768198790} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 1, w: -4.37113883e-08} m_LocalPosition: {x: 0, y: 2.5, z: 15} m_LocalScale: {x: 30, y: 5, z: .5} m_Children: [] @@ -897,7 +1017,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -925,6 +1045,20 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 768198790} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!95 &768198795 +Animator: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 768198790} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 9bba86561c279bd49a939ba6c2758a91, type: 2} + m_CullingMode: 0 + m_ApplyRootMotion: 1 + m_AnimatePhysics: 0 + m_HasTransformHierarchy: 1 --- !u!1 &787766216 GameObject: m_ObjectHideFlags: 0 @@ -1636,7 +1770,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 5fd4928e569cf5b4780a5e82c44af0b0, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -1716,7 +1850,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 @@ -2018,7 +2152,7 @@ Renderer: m_LightmapIndex: 255 m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0} m_Materials: - - {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 6c817ac5d755d2343bf3a564d97c89a7, type: 2} m_SubsetIndices: m_StaticBatchRoot: {fileID: 0} m_UseLightProbes: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 66d6e0b..f3f35e5 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -11,18 +11,18 @@ public class PlayerController : MonoBehaviour { public Transform shankSpawn; public GameObject vvAura; public int swigCounter; + private int swigs = 0; void Update() { - int swigs = 0; - if (Input.GetButton("Fire1") && Time.time > nextFire) { + //audio.Play (); nextFire = Time.time + delay; Instantiate(shank, shankSpawn.position, playerAngle.rotation); } - if (Input.GetButton("ActivateVV") && swigs <= swigCounter && Time.time > nextFire) + if (Input.GetButton("ActivateVV") && swigs < swigCounter && Time.time > nextFire) { nextFire = Time.time + delay * 2; Instantiate (vvAura, rigidbody.position, rigidbody.rotation); diff --git a/Assets/Sprites/Materials/brickwal-not-animatedl0.mat b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat new file mode 100644 index 0000000..7d2f9ae --- /dev/null +++ b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: brickwal-not-animatedl0 + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: f24a3f9e912f9b14b98097a9d998cfbc, type: 3} + m_Scale: {x: 2, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Sprites/Materials/brickwal-not-animatedl0.mat.meta b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat.meta new file mode 100644 index 0000000..2f1fcb9 --- /dev/null +++ b/Assets/Sprites/Materials/brickwal-not-animatedl0.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 6c817ac5d755d2343bf3a564d97c89a7 +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/Materials/brickwall.mat b/Assets/Sprites/Materials/brickwall.mat new file mode 100644 index 0000000..9f7a044 --- /dev/null +++ b/Assets/Sprites/Materials/brickwall.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: brickwall + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Sprites/Materials/brickwall.mat.meta b/Assets/Sprites/Materials/brickwall.mat.meta new file mode 100644 index 0000000..9081130 --- /dev/null +++ b/Assets/Sprites/Materials/brickwall.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 0fc471aef7b00ea41bda4bf2f454bf7a +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/Materials/floor.mat b/Assets/Sprites/Materials/floor.mat new file mode 100644 index 0000000..997a583 --- /dev/null +++ b/Assets/Sprites/Materials/floor.mat @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: floor + m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: [] + m_CustomRenderQueue: -1 + m_SavedProperties: + serializedVersion: 2 + m_TexEnvs: + data: + first: + name: _MainTex + second: + m_Texture: {fileID: 2800000, guid: aad1c3a7e9be2d84ebed6243e1a7541b, type: 3} + m_Scale: {x: 10, y: 10} + m_Offset: {x: 0, y: 0} + m_Floats: {} + m_Colors: + data: + first: + name: _Color + second: {r: 1, g: 1, b: 1, a: 1} diff --git a/Assets/Sprites/Materials/floor.mat.meta b/Assets/Sprites/Materials/floor.mat.meta new file mode 100644 index 0000000..224ee02 --- /dev/null +++ b/Assets/Sprites/Materials/floor.mat.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 5fd4928e569cf5b4780a5e82c44af0b0 +NativeFormatImporter: + userData: diff --git a/Assets/Sprites/brickwal-not-animatedl0.png.meta b/Assets/Sprites/brickwal-not-animatedl0.png.meta new file mode 100644 index 0000000..a15048f --- /dev/null +++ b/Assets/Sprites/brickwal-not-animatedl0.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: f24a3f9e912f9b14b98097a9d998cfbc +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 4096 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/brickwal-not-animatedl1.png.meta b/Assets/Sprites/brickwal-not-animatedl1.png.meta new file mode 100644 index 0000000..6341a6f --- /dev/null +++ b/Assets/Sprites/brickwal-not-animatedl1.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 5bb24ec356b33594e84a4eae8bb6f4cd +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/brickwall.ase.meta b/Assets/Sprites/brickwall.ase.meta new file mode 100644 index 0000000..40a3041 --- /dev/null +++ b/Assets/Sprites/brickwall.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 970706bf9cc13454d9298b65672ec9f5 +DefaultImporter: + userData: diff --git a/Assets/Sprites/brickwall.png.meta b/Assets/Sprites/brickwall.png.meta new file mode 100644 index 0000000..2545c80 --- /dev/null +++ b/Assets/Sprites/brickwall.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 26c9dff0fed396341b045e42e3a0b500 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 1024 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/demon-head.ase.meta b/Assets/Sprites/demon-head.ase.meta new file mode 100644 index 0000000..e659270 --- /dev/null +++ b/Assets/Sprites/demon-head.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 8d4c78aa2d62f114789e7c16446e8fdc +DefaultImporter: + userData: diff --git a/Assets/Sprites/demon-head.png.meta b/Assets/Sprites/demon-head.png.meta new file mode 100644 index 0000000..e496db6 --- /dev/null +++ b/Assets/Sprites/demon-head.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: 36025b30706e16046aa7e291e5eb7c76 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/demon-hero-idle.png.meta b/Assets/Sprites/demon-hero-idle.png.meta new file mode 100644 index 0000000..ec01b43 --- /dev/null +++ b/Assets/Sprites/demon-hero-idle.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: bf0037c206d67144d8e55f3a177cfda6 +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -1 + maxTextureSize: 1024 + textureSettings: + filterMode: -1 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/Sprites/floor.ase.meta b/Assets/Sprites/floor.ase.meta new file mode 100644 index 0000000..715af84 --- /dev/null +++ b/Assets/Sprites/floor.ase.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 63f5b83dc04fd7d478f767615ce7d40d +DefaultImporter: + userData: diff --git a/Assets/Sprites/floor.png.meta b/Assets/Sprites/floor.png.meta new file mode 100644 index 0000000..2fd866f --- /dev/null +++ b/Assets/Sprites/floor.png.meta @@ -0,0 +1,45 @@ +fileFormatVersion: 2 +guid: aad1c3a7e9be2d84ebed6243e1a7541b +TextureImporter: + serializedVersion: 2 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + linearTexture: 0 + correctGamma: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: .25 + normalMapFilter: 0 + isReadable: 0 + grayScaleToAlpha: 0 + generateCubemap: 0 + seamlessCubemap: 0 + textureFormat: -3 + maxTextureSize: 1024 + textureSettings: + filterMode: 0 + aniso: -1 + mipBias: -1 + wrapMode: -1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: .5, y: .5} + spritePixelsToUnits: 100 + alphaIsTransparency: 0 + textureType: -1 + buildTargetSettings: [] + spriteSheet: + sprites: [] + spritePackingTag: + userData: diff --git a/Assets/wall.anim b/Assets/wall.anim new file mode 100644 index 0000000..03a39d0 --- /dev/null +++ b/Assets/wall.anim @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: wall + serializedVersion: 4 + m_AnimationType: 2 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_AnimationClipSettings: + serializedVersion: 2 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 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_Events: [] diff --git a/Assets/wall.anim.meta b/Assets/wall.anim.meta new file mode 100644 index 0000000..1f035fc --- /dev/null +++ b/Assets/wall.anim.meta @@ -0,0 +1,4 @@ +fileFormatVersion: 2 +guid: 549d46924b8ba044a9c93c2d141b5ce4 +NativeFormatImporter: + userData: