Commit a428b69

committed

sound & fixes

added the rest of the sounds to the main game (now just need to add menu music) and also fixed the issues with the melee weaposn where they were still being destoryed, added a new tag to them

1 parent 3255c40 commit a428b69Copy full SHA for a428b69

File tree

20 files changed

+745

-203

lines changed

Native_Compilation_Project/Assets
- Audio/Music
  - Infraction- Scammer.wav.meta
  - Infraction- Scammer.wav
- Enemy
  - Prefabs
  - Scripts
    - Enemy.cs
    - EnemyHealth.cs
- Level Managers
- Player/Scripts
  - WeaponPickup.cs
- Progression
  - GameManager.cs
- Scenes
  - SampleScene.unity
- Weapons/Prefabs
  - Bat.prefab
  - Knife.prefab

20 files changed

+745

-203

lines changed

`‎Native_Compilation_Project/Assets/Audio/Music/Infraction- Scammer.wav`

-31.1 MB

Binary file not shown.

`‎Native_Compilation_Project/Assets/Audio/Music/Infraction- Scammer.wav.meta`

Lines changed: 0 additions & 22 deletions

This file was deleted.

`‎Native_Compilation_Project/Assets/Enemy/Prefabs/Assult_E.prefab`

Lines changed: 47 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ MonoBehaviour:`
`300`	`300`	`m_Script: {fileID: 11500000, guid: 0bdb47b7a1608ed49b9adc7ec181bbe8, type: 3}`
`301`	`301`	`m_Name:`
`302`	`302`	`m_EditorClassIdentifier:`
	`303`	`+ _player: {fileID: 0}`
`303`	`304`	`shotParticleEffect: {fileID: 6118084653027632576, guid: 10a454588b8a42043b9619aea77c70a1, type: 3}`
	`305`	`+ stop: 0`
`304`	`306`	`speed: 3.5`
`305`	`307`	`angularSpeed: 9999`
`306`	`308`	`acceleration: 5`
`@@ -318,6 +320,8 @@ MonoBehaviour:`
`318`	`320`	`currentPoint: 0`
`319`	`321`	`distanceToPoint: 1`
`320`	`322`	`wanderingStoppingDistance: 0`
	`323`	`+ audioSource: {fileID: -1497730302607513633}`
	`324`	`+ audioClip: {fileID: 8300000, guid: b39ec697f76aec04fb8081c0c4f6dbae, type: 3}`
`321`	`325`	`attackDistance: 20`
`322`	`326`	`maxShootRate: 0.15`
`323`	`327`	`damage: 15`
`@@ -354,36 +358,63 @@ AudioSource:`
`354`	`358`	`Mute: 0`
`355`	`359`	`Spatialize: 0`
`356`	`360`	`SpatializePostEffects: 0`
`357`		`- Priority: 80`
	`361`	`+ Priority: 256`
`358`	`362`	`DopplerLevel: 1`
`359`		`- MinDistance: 1`
	`363`	`+ MinDistance: 40`
`360`	`364`	`MaxDistance: 500`
`361`	`365`	`Pan2D: 0`
`362`		`- rolloffMode: 0`
	`366`	`+ rolloffMode: 2`
`363`	`367`	`BypassEffects: 0`
`364`	`368`	`BypassListenerEffects: 0`
`365`	`369`	`BypassReverbZones: 0`
`366`	`370`	`rolloffCustomCurve:`
`367`	`371`	`serializedVersion: 2`
`368`	`372`	`m_Curve:`
`369`	`373`	`- serializedVersion: 3`
`370`		`- time: 0`
`371`		`- value: 1`
`372`		`- inSlope: 0`
`373`		`- outSlope: 0`
	`374`	`+ time: 0.10030395`
	`375`	`+ value: 0.9953499`
	`376`	`+ inSlope: 0.054669484`
	`377`	`+ outSlope: 0.054669484`
`374`	`378`	`tangentMode: 0`
`375`	`379`	`weightedMode: 0`
`376`		`- inWeight: 0.33333334`
`377`		`- outWeight: 0.33333334`
	`380`	`+ inWeight: 0`
	`381`	`+ outWeight: 0.5317231`
	`382`	`+ - serializedVersion: 3`
	`383`	`+ time: 0.6400567`
	`384`	`+ value: 0.99290085`
	`385`	`+ inSlope: 0.09399374`
	`386`	`+ outSlope: 0.09399374`
	`387`	`+ tangentMode: 0`
	`388`	`+ weightedMode: 0`
	`389`	`+ inWeight: 0`
	`390`	`+ outWeight: 1`
	`391`	`+ - serializedVersion: 3`
	`392`	`+ time: 0.7335669`
	`393`	`+ value: 1.0025978`
	`394`	`+ inSlope: 0.017214652`
	`395`	`+ outSlope: 0.017214652`
	`396`	`+ tangentMode: 0`
	`397`	`+ weightedMode: 0`
	`398`	`+ inWeight: 1`
	`399`	`+ outWeight: 0`
	`400`	`+ - serializedVersion: 3`
	`401`	`+ time: 0.8570424`
	`402`	`+ value: 0.9879799`
	`403`	`+ inSlope: -0.19058`
	`404`	`+ outSlope: -0.19058`
	`405`	`+ tangentMode: 0`
	`406`	`+ weightedMode: 0`
	`407`	`+ inWeight: 0`
	`408`	`+ outWeight: 1`
`378`	`409`	`- serializedVersion: 3`
`379`	`410`	`time: 1`
`380`		`- value: 0`
`381`		`- inSlope: 0`
`382`		`- outSlope: 0`
	`411`	`+ value: 0.98164564`
	`412`	`+ inSlope: -0.026515909`
	`413`	`+ outSlope: -0.026515909`
`383`	`414`	`tangentMode: 0`
`384`	`415`	`weightedMode: 0`
`385`		`- inWeight: 0.33333334`
`386`		`- outWeight: 0.33333334`
	`416`	`+ inWeight: 1`
	`417`	`+ outWeight: 0`
`387`	`418`	`m_PreInfinity: 2`
`388`	`419`	`m_PostInfinity: 2`
`389`	`420`	`m_RotationOrder: 4`
`@@ -392,7 +423,7 @@ AudioSource:`
`392`	`423`	`m_Curve:`
`393`	`424`	`- serializedVersion: 3`
`394`	`425`	`time: 0`
`395`		`- value: 0`
	`426`	`+ value: 1`
`396`	`427`	`inSlope: 0`
`397`	`428`	`outSlope: 0`
`398`	`429`	`tangentMode: 0`
`@@ -407,7 +438,7 @@ AudioSource:`
`407`	`438`	`m_Curve:`
`408`	`439`	`- serializedVersion: 3`
`409`	`440`	`time: 0`
`410`		`- value: 0`
	`441`	`+ value: 1`
`411`	`442`	`inSlope: 0`
`412`	`443`	`outSlope: 0`
`413`	`444`	`tangentMode: 0`

`‎Native_Compilation_Project/Assets/Enemy/Prefabs/Bat_E.prefab`

Lines changed: 47 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,9 @@ MonoBehaviour:`
`300`	`300`	`m_Script: {fileID: 11500000, guid: 0bdb47b7a1608ed49b9adc7ec181bbe8, type: 3}`
`301`	`301`	`m_Name:`
`302`	`302`	`m_EditorClassIdentifier:`
	`303`	`+ _player: {fileID: 0}`
`303`	`304`	`shotParticleEffect: {fileID: 6118084653027632576, guid: 10a454588b8a42043b9619aea77c70a1, type: 3}`
	`305`	`+ stop: 0`
`304`	`306`	`speed: 3.5`
`305`	`307`	`angularSpeed: 9999`
`306`	`308`	`acceleration: 7`
`@@ -318,6 +320,8 @@ MonoBehaviour:`
`318`	`320`	`currentPoint: 0`
`319`	`321`	`distanceToPoint: 1`
`320`	`322`	`wanderingStoppingDistance: 0`
	`323`	`+ audioSource: {fileID: 7565485909807007458}`
	`324`	`+ audioClip: {fileID: 8300000, guid: 605611dd6463bbc4090ab6408907d9e8, type: 3}`
`321`	`325`	`attackDistance: 12`
`322`	`326`	`maxShootRate: 0.75`
`323`	`327`	`damage: 10`
`@@ -354,36 +358,63 @@ AudioSource:`
`354`	`358`	`Mute: 0`
`355`	`359`	`Spatialize: 0`
`356`	`360`	`SpatializePostEffects: 0`
`357`		`- Priority: 80`
	`361`	`+ Priority: 256`
`358`	`362`	`DopplerLevel: 1`
`359`		`- MinDistance: 1`
	`363`	`+ MinDistance: 40`
`360`	`364`	`MaxDistance: 500`
`361`	`365`	`Pan2D: 0`
`362`		`- rolloffMode: 0`
	`366`	`+ rolloffMode: 2`
`363`	`367`	`BypassEffects: 0`
`364`	`368`	`BypassListenerEffects: 0`
`365`	`369`	`BypassReverbZones: 0`
`366`	`370`	`rolloffCustomCurve:`
`367`	`371`	`serializedVersion: 2`
`368`	`372`	`m_Curve:`
`369`	`373`	`- serializedVersion: 3`
`370`		`- time: 0`
`371`		`- value: 1`
`372`		`- inSlope: 0`
`373`		`- outSlope: 0`
	`374`	`+ time: 0.10030395`
	`375`	`+ value: 0.9953499`
	`376`	`+ inSlope: 0.054669484`
	`377`	`+ outSlope: 0.054669484`
`374`	`378`	`tangentMode: 0`
`375`	`379`	`weightedMode: 0`
`376`		`- inWeight: 0.33333334`
`377`		`- outWeight: 0.33333334`
	`380`	`+ inWeight: 0`
	`381`	`+ outWeight: 0.5317231`
	`382`	`+ - serializedVersion: 3`
	`383`	`+ time: 0.6400567`
	`384`	`+ value: 0.99290085`
	`385`	`+ inSlope: 0.09399374`
	`386`	`+ outSlope: 0.09399374`
	`387`	`+ tangentMode: 0`
	`388`	`+ weightedMode: 0`
	`389`	`+ inWeight: 0`
	`390`	`+ outWeight: 1`
	`391`	`+ - serializedVersion: 3`
	`392`	`+ time: 0.7335669`
	`393`	`+ value: 1.0025978`
	`394`	`+ inSlope: 0.017214652`
	`395`	`+ outSlope: 0.017214652`
	`396`	`+ tangentMode: 0`
	`397`	`+ weightedMode: 0`
	`398`	`+ inWeight: 1`
	`399`	`+ outWeight: 0`
	`400`	`+ - serializedVersion: 3`
	`401`	`+ time: 0.8570424`
	`402`	`+ value: 0.9879799`
	`403`	`+ inSlope: -0.19058`
	`404`	`+ outSlope: -0.19058`
	`405`	`+ tangentMode: 0`
	`406`	`+ weightedMode: 0`
	`407`	`+ inWeight: 0`
	`408`	`+ outWeight: 1`
`378`	`409`	`- serializedVersion: 3`
`379`	`410`	`time: 1`
`380`		`- value: 0`
`381`		`- inSlope: 0`
`382`		`- outSlope: 0`
	`411`	`+ value: 0.98164564`
	`412`	`+ inSlope: -0.026515909`
	`413`	`+ outSlope: -0.026515909`
`383`	`414`	`tangentMode: 0`
`384`	`415`	`weightedMode: 0`
`385`		`- inWeight: 0.33333334`
`386`		`- outWeight: 0.33333334`
	`416`	`+ inWeight: 1`
	`417`	`+ outWeight: 0`
`387`	`418`	`m_PreInfinity: 2`
`388`	`419`	`m_PostInfinity: 2`
`389`	`420`	`m_RotationOrder: 4`
`@@ -392,7 +423,7 @@ AudioSource:`
`392`	`423`	`m_Curve:`
`393`	`424`	`- serializedVersion: 3`
`394`	`425`	`time: 0`
`395`		`- value: 0`
	`426`	`+ value: 1`
`396`	`427`	`inSlope: 0`
`397`	`428`	`outSlope: 0`
`398`	`429`	`tangentMode: 0`
`@@ -407,7 +438,7 @@ AudioSource:`
`407`	`438`	`m_Curve:`
`408`	`439`	`- serializedVersion: 3`
`409`	`440`	`time: 0`
`410`		`- value: 0`
	`441`	`+ value: 1`
`411`	`442`	`inSlope: 0`
`412`	`443`	`outSlope: 0`
`413`	`444`	`tangentMode: 0`

`‎Native_Compilation_Project/Assets/Enemy/Prefabs/Fist_E.prefab`

Lines changed: 47 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,9 @@ MonoBehaviour:`
`172`	`172`	`m_Script: {fileID: 11500000, guid: 0bdb47b7a1608ed49b9adc7ec181bbe8, type: 3}`
`173`	`173`	`m_Name:`
`174`	`174`	`m_EditorClassIdentifier:`
	`175`	`+ _player: {fileID: 0}`
`175`	`176`	`shotParticleEffect: {fileID: 6118084653027632576, guid: 10a454588b8a42043b9619aea77c70a1, type: 3}`
	`177`	`+ stop: 0`
`176`	`178`	`speed: 3.5`
`177`	`179`	`angularSpeed: 9999`
`178`	`180`	`acceleration: 7`
`@@ -190,6 +192,8 @@ MonoBehaviour:`
`190`	`192`	`currentPoint: 0`
`191`	`193`	`distanceToPoint: 1`
`192`	`194`	`wanderingStoppingDistance: 0`
	`195`	`+ audioSource: {fileID: 2643199252444664893}`
	`196`	`+ audioClip: {fileID: 8300000, guid: cd13436b01a4b5b4082c89e180d10dc3, type: 3}`
`193`	`197`	`attackDistance: 12`
`194`	`198`	`maxShootRate: 0.75`
`195`	`199`	`damage: 10`
`@@ -226,36 +230,63 @@ AudioSource:`
`226`	`230`	`Mute: 0`
`227`	`231`	`Spatialize: 0`
`228`	`232`	`SpatializePostEffects: 0`
`229`		`- Priority: 80`
	`233`	`+ Priority: 256`
`230`	`234`	`DopplerLevel: 1`
`231`		`- MinDistance: 1`
	`235`	`+ MinDistance: 40`
`232`	`236`	`MaxDistance: 500`
`233`	`237`	`Pan2D: 0`
`234`		`- rolloffMode: 0`
	`238`	`+ rolloffMode: 2`
`235`	`239`	`BypassEffects: 0`
`236`	`240`	`BypassListenerEffects: 0`
`237`	`241`	`BypassReverbZones: 0`
`238`	`242`	`rolloffCustomCurve:`
`239`	`243`	`serializedVersion: 2`
`240`	`244`	`m_Curve:`
`241`	`245`	`- serializedVersion: 3`
`242`		`- time: 0`
`243`		`- value: 1`
`244`		`- inSlope: 0`
`245`		`- outSlope: 0`
	`246`	`+ time: 0.10030395`
	`247`	`+ value: 0.9953499`
	`248`	`+ inSlope: 0.054669484`
	`249`	`+ outSlope: 0.054669484`
`246`	`250`	`tangentMode: 0`
`247`	`251`	`weightedMode: 0`
`248`		`- inWeight: 0.33333334`
`249`		`- outWeight: 0.33333334`
	`252`	`+ inWeight: 0`
	`253`	`+ outWeight: 0.5317231`
	`254`	`+ - serializedVersion: 3`
	`255`	`+ time: 0.6400567`
	`256`	`+ value: 0.99290085`
	`257`	`+ inSlope: 0.09399374`
	`258`	`+ outSlope: 0.09399374`
	`259`	`+ tangentMode: 0`
	`260`	`+ weightedMode: 0`
	`261`	`+ inWeight: 0`
	`262`	`+ outWeight: 1`
	`263`	`+ - serializedVersion: 3`
	`264`	`+ time: 0.7335669`
	`265`	`+ value: 1.0025978`
	`266`	`+ inSlope: 0.017214652`
	`267`	`+ outSlope: 0.017214652`
	`268`	`+ tangentMode: 0`
	`269`	`+ weightedMode: 0`
	`270`	`+ inWeight: 1`
	`271`	`+ outWeight: 0`
	`272`	`+ - serializedVersion: 3`
	`273`	`+ time: 0.8570424`
	`274`	`+ value: 0.9879799`
	`275`	`+ inSlope: -0.19058`
	`276`	`+ outSlope: -0.19058`
	`277`	`+ tangentMode: 0`
	`278`	`+ weightedMode: 0`
	`279`	`+ inWeight: 0`
	`280`	`+ outWeight: 1`
`250`	`281`	`- serializedVersion: 3`
`251`	`282`	`time: 1`
`252`		`- value: 0`
`253`		`- inSlope: 0`
`254`		`- outSlope: 0`
	`283`	`+ value: 0.98164564`
	`284`	`+ inSlope: -0.026515909`
	`285`	`+ outSlope: -0.026515909`
`255`	`286`	`tangentMode: 0`
`256`	`287`	`weightedMode: 0`
`257`		`- inWeight: 0.33333334`
`258`		`- outWeight: 0.33333334`
	`288`	`+ inWeight: 1`
	`289`	`+ outWeight: 0`
`259`	`290`	`m_PreInfinity: 2`
`260`	`291`	`m_PostInfinity: 2`
`261`	`292`	`m_RotationOrder: 4`
`@@ -264,7 +295,7 @@ AudioSource:`
`264`	`295`	`m_Curve:`
`265`	`296`	`- serializedVersion: 3`
`266`	`297`	`time: 0`
`267`		`- value: 0`
	`298`	`+ value: 1`
`268`	`299`	`inSlope: 0`
`269`	`300`	`outSlope: 0`
`270`	`301`	`tangentMode: 0`
`@@ -279,7 +310,7 @@ AudioSource:`
`279`	`310`	`m_Curve:`
`280`	`311`	`- serializedVersion: 3`
`281`	`312`	`time: 0`
`282`		`- value: 0`
	`313`	`+ value: 1`
`283`	`314`	`inSlope: 0`
`284`	`315`	`outSlope: 0`
`285`	`316`	`tangentMode: 0`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a428b69

File tree

20 files changed

20 files changed

`‎Native_Compilation_Project/Assets/Audio/Music/Infraction- Scammer.wav`

`‎Native_Compilation_Project/Assets/Audio/Music/Infraction- Scammer.wav.meta`

`‎Native_Compilation_Project/Assets/Enemy/Prefabs/Assult_E.prefab`

`‎Native_Compilation_Project/Assets/Enemy/Prefabs/Bat_E.prefab`

`‎Native_Compilation_Project/Assets/Enemy/Prefabs/Fist_E.prefab`

0 commit comments