diff --git a/Assets/Audio/DemonShanker_FastTheme.wav b/Assets/Audio/DemonShanker_FastTheme.wav new file mode 100644 index 0000000..2811527 Binary files /dev/null and b/Assets/Audio/DemonShanker_FastTheme.wav differ diff --git a/Assets/Audio/DemonShanker_FastTheme.wav.meta b/Assets/Audio/DemonShanker_FastTheme.wav.meta new file mode 100644 index 0000000..8cf0a13 --- /dev/null +++ b/Assets/Audio/DemonShanker_FastTheme.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 38bfc99e65cfc8f4bb53f50021693720 +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Audio/DemonShanker_SlowTheme.wav b/Assets/Audio/DemonShanker_SlowTheme.wav new file mode 100644 index 0000000..3c01582 Binary files /dev/null and b/Assets/Audio/DemonShanker_SlowTheme.wav differ diff --git a/Assets/Audio/DemonShanker_SlowTheme.wav.meta b/Assets/Audio/DemonShanker_SlowTheme.wav.meta new file mode 100644 index 0000000..fc308a7 --- /dev/null +++ b/Assets/Audio/DemonShanker_SlowTheme.wav.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 43d17e344e9b98d40b035dae2a27571a +AudioImporter: + serializedVersion: 4 + format: -1 + quality: -1 + stream: 1 + 3D: 1 + forceToMono: 0 + useHardware: 0 + loopable: 0 + userData: diff --git a/Assets/Prefabs/Shanking Detector.prefab b/Assets/Prefabs/Shanking Detector.prefab index 939834b..53e1f08 100644 --- a/Assets/Prefabs/Shanking Detector.prefab +++ b/Assets/Prefabs/Shanking Detector.prefab @@ -36,7 +36,7 @@ Renderer: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 100000} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_LightmapIndex: 255 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 84bd50c..2dff448 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -1819,6 +1819,7 @@ GameObject: m_Component: - 4: {fileID: 1164596950} - 114: {fileID: 1164596949} + - 82: {fileID: 1164596951} m_Layer: 0 m_Name: GameController m_TagString: GameController @@ -1859,6 +1860,64 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} +--- !u!82 &1164596951 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1164596948} + m_Enabled: 1 + serializedVersion: 3 + m_audioClip: {fileID: 8300000, guid: 38bfc99e65cfc8f4bb53f50021693720, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + 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!1 &1195109751 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/TitleMenu.unity b/Assets/Scenes/TitleMenu.unity index 46aa9a0..88922d7 100644 --- a/Assets/Scenes/TitleMenu.unity +++ b/Assets/Scenes/TitleMenu.unity @@ -293,7 +293,7 @@ Transform: m_PrefabParentObject: {fileID: 400064, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 353171681} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: .827395439, y: 0, z: 0} m_LocalScale: {x: .939999998, y: .810000002, z: 1} m_Children: [] @@ -373,7 +373,7 @@ Transform: m_PrefabParentObject: {fileID: 400008, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 362490602} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: .889999986, z: 1} m_Children: [] @@ -656,7 +656,7 @@ Transform: m_PrefabParentObject: {fileID: 400004, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 744217424} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: .889999986, z: 1} m_Children: [] @@ -907,7 +907,7 @@ Transform: m_PrefabParentObject: {fileID: 400014, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 936169192} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: .827395439, y: 0, z: 0} m_LocalScale: {x: .939999998, y: .810000002, z: 1} m_Children: [] @@ -1345,7 +1345,7 @@ Transform: m_PrefabParentObject: {fileID: 400060, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 1056369941} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: .850000024, z: 1} m_Children: [] @@ -1441,7 +1441,7 @@ Transform: m_PrefabParentObject: {fileID: 400054, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 1162005753} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: .939999998, y: .810000002, z: 1} m_Children: [] @@ -1781,7 +1781,7 @@ Transform: m_PrefabParentObject: {fileID: 400012, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 1746769090} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: .827395439, y: 0, z: 0} m_LocalScale: {x: .939999998, y: .810000002, z: 1} m_Children: [] @@ -2009,7 +2009,7 @@ Transform: m_PrefabParentObject: {fileID: 400002, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2} m_PrefabInternal: {fileID: 2125347412} m_GameObject: {fileID: 1868927042} - m_LocalRotation: {x: .382683456, y: 0, z: 0, w: .923879504} + m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: .889999986, z: 1} m_Children: [] @@ -2203,6 +2203,7 @@ GameObject: - 92: {fileID: 1921743829} - 124: {fileID: 1921743828} - 81: {fileID: 1921743827} + - 82: {fileID: 1921743832} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -2271,6 +2272,64 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} +--- !u!82 &1921743832 +AudioSource: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1921743826} + m_Enabled: 1 + serializedVersion: 3 + m_audioClip: {fileID: 8300000, guid: 43d17e344e9b98d40b035dae2a27571a, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + 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!1 &2025978448 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameController.cs b/Assets/Scripts/GameController.cs index 0307a11..4876efc 100644 --- a/Assets/Scripts/GameController.cs +++ b/Assets/Scripts/GameController.cs @@ -39,7 +39,7 @@ public class GameController : MonoBehaviour { Vector3 spawnPosition = new Vector3 (20f, 3f, 9f); Quaternion spawnRotation = Quaternion.identity; - Instantiate (patronObjects[Random.Range (0, patronObjects.Length-1)], spawnPosition, spawnRotation); + Instantiate (patronObjects[Random.Range (0, patronObjects.Length)], spawnPosition, spawnRotation); patronCounter++; 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/Builds/Builds.html b/Builds/Builds.html new file mode 100644 index 0000000..cd006a8 --- /dev/null +++ b/Builds/Builds.html @@ -0,0 +1,136 @@ + + + + + Unity Web Player | Demon Shanker 2 + + + + + + +

Unity Web Player | Demon Shanker 2

+
+
+
+ + Unity Web Player. Install now! + +
+
+ + Unity Web Player. Install now! Restart your browser after install. + +
+
+
+

« created with Unity »

+ + diff --git a/Builds/Builds.unity3d b/Builds/Builds.unity3d new file mode 100644 index 0000000..3912cbb Binary files /dev/null and b/Builds/Builds.unity3d differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index d85d964..3cde0dc 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -5,5 +5,7 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 m_Scenes: + - enabled: 1 + path: Assets/Scenes/TitleMenu.unity - enabled: 1 path: Assets/Scenes/Main.unity