Merge remote-tracking branch 'origin/dev' into jason

# Conflicts:
#	Assets/Scripts/Arena.cs
#	Assets/Scripts/Entity.cs
This commit is contained in:
Jason Durand 01 2022-04-03 18:24:40 -04:00
commit 45f76762fb
22 changed files with 1665 additions and 117 deletions

View File

@ -60693,6 +60693,37 @@ Transform:
m_Father: {fileID: 9196727425507610130}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7733931892361074138
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6491101087853085319}
m_Layer: 0
m_Name: Audio Sources
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6491101087853085319
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7733931892361074138}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7795525019298260169}
m_Father: {fileID: 9196727425507610130}
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8205972623206729468
GameObject:
m_ObjectHideFlags: 0
@ -62319,6 +62350,7 @@ Transform:
- {fileID: 1787272690}
- {fileID: 1853140661}
- {fileID: 7588367539711513062}
- {fileID: 6491101087853085319}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -62353,6 +62385,13 @@ MonoBehaviour:
<gladiatorParent>k__BackingField: {fileID: 793317230}
<minionParent>k__BackingField: {fileID: 1787272690}
<graveyard>k__BackingField: {fileID: 1550580935}
currWaveSize: 0
waveSource: {fileID: 3547338400796300921}
waveSounds:
- {fileID: 8300000, guid: f485fbe748a48b446b4e06c349ae2107, type: 3}
- {fileID: 8300000, guid: 4eb309ec26566484d9843c15f85f1d72, type: 3}
- {fileID: 8300000, guid: c374925f1f2c1f84286b9d9917bbdb80, type: 3}
soundManager: {fileID: 0}
--- !u!114 &1359990806
MonoBehaviour:
m_ObjectHideFlags: 0
@ -63439,6 +63478,73 @@ Transform:
m_CorrespondingSourceObject: {fileID: 1933134022928666816, guid: 4da2d7c3520f17b4ebee7e57a5908d12, type: 3}
m_PrefabInstance: {fileID: 2093421722}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1542312141482263668
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6491101087853085319}
m_Modifications:
- target: {fileID: 2758730940586161386, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_Name
value: Wave Source
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
--- !u!82 &3547338400796300921 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 2620472399707132429, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
m_PrefabInstance: {fileID: 1542312141482263668}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7795525019298260169 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8739270309622046909, guid: e44eba2abf026f34c9d225a115f5d55a, type: 3}
m_PrefabInstance: {fileID: 1542312141482263668}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3218203505444173496
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -0,0 +1,129 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2758730940586161386
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8739270309622046909}
- component: {fileID: 2620472399707132429}
m_Layer: 0
m_Name: Audio Source 2D
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8739270309622046909
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2758730940586161386}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &2620472399707132429
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2758730940586161386}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: e44eba2abf026f34c9d225a115f5d55a
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,129 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6915619910278317271
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 70347360213241984}
- component: {fileID: 6767790137851257392}
m_Layer: 0
m_Name: Audio Source 3D
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &70347360213241984
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6915619910278317271}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &6767790137851257392
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6915619910278317271}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8929857cf558a9b40a30682dc94048ad
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -113,6 +113,10 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 161084746864990857, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 197677485360569561, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: m_Name
value: Big Knight Variant
@ -161,10 +165,38 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 197677485360569566, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: attackSounds.Array.size
value: 5
objectReference: {fileID: 0}
- target: {fileID: 197677485360569566, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: <renderer>k__BackingField
value:
objectReference: {fileID: 1594628713}
- target: {fileID: 197677485360569566, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: attackSounds.Array.data[0]
value:
objectReference: {fileID: 8300000, guid: 25f02fc287c10214b860205c26804cc9, type: 3}
- target: {fileID: 197677485360569566, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: attackSounds.Array.data[1]
value:
objectReference: {fileID: 8300000, guid: 572a5b8d3fd2fff40aeabc2491982dff, type: 3}
- target: {fileID: 197677485360569566, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: attackSounds.Array.data[2]
value:
objectReference: {fileID: 8300000, guid: fbda32094e1896a4b88d9e5c31cd0189, type: 3}
- target: {fileID: 197677485360569566, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: attackSounds.Array.data[3]
value:
objectReference: {fileID: 8300000, guid: 605f6c766a7357841a25089d2ce2c5cb, type: 3}
- target: {fileID: 197677485360569566, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: attackSounds.Array.data[4]
value:
objectReference: {fileID: 8300000, guid: ff52088c39c2bb840b1a0f1902b594ee, type: 3}
- target: {fileID: 218553800040352715, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1378753993384522801, guid: b25a487d193f24049b6a791adf592b2e, type: 3}
propertyPath: m_AnchorMax.x
value: 0

View File

@ -34,6 +34,7 @@ Transform:
- {fileID: 3324925360650734151}
- {fileID: 1378753994466832711}
- {fileID: 161084746864990857}
- {fileID: 218553800040352715}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -66,6 +67,26 @@ MonoBehaviour:
deadColor: {r: 0.7075472, g: 0.030037368, b: 0.030037368, a: 1}
emptyColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 0.4117647}
animator: {fileID: 0}
soundManager: {fileID: 0}
hurtSource: {fileID: 4476512741303027505}
deathSource: {fileID: 7471870309671043834}
hurtSounds:
- {fileID: 8300000, guid: 4890fcc7dd0e7e94b91ceaed0aa47ae2, type: 3}
- {fileID: 8300000, guid: 8ab23931c850bae4fbcdd039393ee80c, type: 3}
- {fileID: 8300000, guid: 88ba18cf16f321644b92eb498973ee73, type: 3}
deathSounds:
- {fileID: 8300000, guid: 2f6e87c7054deeb4bab220726024a3c2, type: 3}
- {fileID: 8300000, guid: 4c1b7822a9c6ab24082bd55a58debb7d, type: 3}
- {fileID: 8300000, guid: 715fcd41989bba641a5a061bde42fe34, type: 3}
- {fileID: 8300000, guid: e746c89d44a613f469f7ae3fa7de7a2a, type: 3}
- {fileID: 8300000, guid: 31ce317393fa8a24bbc2bc8c7a39c56e, type: 3}
attackSource: {fileID: 3273248897583023351}
attackSounds:
- {fileID: 8300000, guid: d7fbefedc07adc94d8bf9b963ac2fe88, type: 3}
- {fileID: 8300000, guid: e6a3a97839444ca499bd432fc87242f8, type: 3}
- {fileID: 8300000, guid: b838acf9c619d694d855fa7248d0dae5, type: 3}
- {fileID: 8300000, guid: d8fd170823304ac4099347ee570b5250, type: 3}
- {fileID: 8300000, guid: 370647846d18d1b4692367dc8783b92e, type: 3}
AIStats: {fileID: 11400000, guid: 9d8a9a664d932d0498d5eca7607eeb53, type: 2}
--- !u!58 &3988163462708087662
CircleCollider2D:
@ -155,6 +176,39 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &3207813502995273367
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 218553800040352715}
m_Layer: 0
m_Name: Audio Sources
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &218553800040352715
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3207813502995273367}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7136566407457748353}
- {fileID: 4225647201354428490}
- {fileID: 8104512644020549191}
m_Father: {fileID: 197677485360569565}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3772547392739388838
GameObject:
m_ObjectHideFlags: 0
@ -460,3 +514,204 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aadb67b8f73573a44b31b015f38561ee, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &4205639881512132810
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 218553800040352715}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Death Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &4225647201354428490 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 4205639881512132810}
m_PrefabAsset: {fileID: 0}
--- !u!82 &7471870309671043834 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 4205639881512132810}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7202313375586755841
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 218553800040352715}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Hurt Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &7136566407457748353 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 7202313375586755841}
m_PrefabAsset: {fileID: 0}
--- !u!82 &4476512741303027505 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 7202313375586755841}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8106742946858280647
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 218553800040352715}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Attack Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &8104512644020549191 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 8106742946858280647}
m_PrefabAsset: {fileID: 0}
--- !u!82 &3273248897583023351 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 8106742946858280647}
m_PrefabAsset: {fileID: 0}

View File

@ -109,6 +109,10 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 160730869004340736, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2399377275812995968, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: m_RootOrder
value: 0
@ -153,14 +157,34 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2399377275812995974, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: deathSounds.Array.size
value: 3
objectReference: {fileID: 0}
- target: {fileID: 2399377275812995974, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: <renderer>k__BackingField
value:
objectReference: {fileID: 1205254930}
- target: {fileID: 2399377275812995974, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: deathSounds.Array.data[0]
value:
objectReference: {fileID: 8300000, guid: fdfbc11957203494ea7cfefd3e7369ce, type: 3}
- target: {fileID: 2399377275812995974, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: deathSounds.Array.data[1]
value:
objectReference: {fileID: 8300000, guid: 007c30489b91e304caf6e02b395e25e8, type: 3}
- target: {fileID: 2399377275812995974, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: deathSounds.Array.data[2]
value:
objectReference: {fileID: 8300000, guid: 2bfd74251b8800843abb9121b2e543f2, type: 3}
- target: {fileID: 2399377275812995980, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: m_Name
value: Goblin Variant
objectReference: {fileID: 0}
- target: {fileID: 2512608386474415677, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 7325874221449804585, guid: 5f633c05dee3f4b4784f5702b2365f02, type: 3}
propertyPath: m_Enabled
value: 0

View File

@ -198,6 +198,7 @@ Transform:
- {fileID: 3597671410581014117}
- {fileID: 7668921808236339569}
- {fileID: 160730869004340736}
- {fileID: 2512608386474415677}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -230,6 +231,28 @@ MonoBehaviour:
deadColor: {r: 0.7058824, g: 0.03137255, b: 0.03137255, a: 1}
emptyColor: {r: 0.5647059, g: 0.5647059, b: 0.5647059, a: 0.4117647}
animator: {fileID: 0}
soundManager: {fileID: 0}
hurtSource: {fileID: 7648647166057607160}
deathSource: {fileID: 5744665979608288930}
hurtSounds:
- {fileID: 8300000, guid: b7f5aabebd9db1049b699beb5a288634, type: 3}
- {fileID: 8300000, guid: 6a0af73a44f61f3439c4461dcced6f01, type: 3}
- {fileID: 8300000, guid: 25b6106c6c31da04a99caba9aa5c236d, type: 3}
- {fileID: 8300000, guid: f8d5fa55cb6c4d6499d1ac825bf44602, type: 3}
- {fileID: 8300000, guid: 089179694371cd74886fb80c62b1c193, type: 3}
- {fileID: 8300000, guid: 71fc19d27b375cb4598fb329fe96f8c5, type: 3}
- {fileID: 8300000, guid: d9ebde30623a6b547b99c4dac9262e0c, type: 3}
deathSounds:
- {fileID: 8300000, guid: 4f67a2efdd445a04b93766599f91979f, type: 3}
- {fileID: 8300000, guid: c13ecb4d061a35a4cb2ffac5b56ca6b5, type: 3}
- {fileID: 8300000, guid: 302e4d81162b7ec4bbfeb3a4a08ac066, type: 3}
attackSource: {fileID: 5001816468400334319}
attackSounds:
- {fileID: 8300000, guid: d7fbefedc07adc94d8bf9b963ac2fe88, type: 3}
- {fileID: 8300000, guid: e6a3a97839444ca499bd432fc87242f8, type: 3}
- {fileID: 8300000, guid: b838acf9c619d694d855fa7248d0dae5, type: 3}
- {fileID: 8300000, guid: d8fd170823304ac4099347ee570b5250, type: 3}
- {fileID: 8300000, guid: 370647846d18d1b4692367dc8783b92e, type: 3}
AIStats: {fileID: 11400000, guid: 9d8a9a664d932d0498d5eca7607eeb53, type: 2}
thrownFromSafeZone: 0
thrownTargetPosition: {x: 0, y: 0, z: 0}
@ -321,6 +344,240 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &6706667572973450630
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2512608386474415677}
m_Layer: 0
m_Name: Audio Sources
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2512608386474415677
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6706667572973450630}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3976852030601354568}
- {fileID: 1345677495184358418}
- {fileID: 1765389454669961055}
m_Father: {fileID: 2399377275812995968}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1320999451025140882
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2512608386474415677}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Death Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &1345677495184358418 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 1320999451025140882}
m_PrefabAsset: {fileID: 0}
--- !u!82 &5744665979608288930 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 1320999451025140882}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1767100823713040351
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2512608386474415677}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Attack Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &1765389454669961055 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 1767100823713040351}
m_PrefabAsset: {fileID: 0}
--- !u!82 &5001816468400334319 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 1767100823713040351}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4019868761555029448
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 2512608386474415677}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Hurt Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &3976852030601354568 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 4019868761555029448}
m_PrefabAsset: {fileID: 0}
--- !u!82 &7648647166057607160 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 4019868761555029448}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4861301622389167767
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -274,6 +274,50 @@ MonoBehaviour:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 3977887685390540695}
--- !u!1 &6708085743686785862
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3240649040312459155}
- component: {fileID: 1884319524323261887}
m_Layer: 0
m_Name: SoundManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3240649040312459155
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6708085743686785862}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8365024801698166081}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1884319524323261887
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6708085743686785862}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b2771a5310833e64798c08aa5371e48b, type: 3}
m_Name:
m_EditorClassIdentifier:
audioMixer: {fileID: 24100000, guid: 06ed4a4573fabf84580596dba3e0c116, type: 2}
--- !u!1 &8365024801038495441
GameObject:
m_ObjectHideFlags: 0
@ -511,6 +555,7 @@ Transform:
- {fileID: 461246139}
- {fileID: 1005651898}
- {fileID: 2678552953295986148}
- {fileID: 3240649040312459155}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -524,7 +569,6 @@ GameObject:
m_Component:
- component: {fileID: 8365024802335227868}
- component: {fileID: 8365024802335227869}
- component: {fileID: 8365024802335227870}
- component: {fileID: 8365024802335227867}
- component: {fileID: 8365024802335227866}
m_Layer: 0
@ -591,14 +635,6 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &8365024802335227870
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8365024802335227871}
m_Enabled: 1
--- !u!114 &8365024802335227867
MonoBehaviour:
m_ObjectHideFlags: 0

View File

@ -16,6 +16,7 @@ GameObject:
- component: {fileID: 1214567908930553477}
- component: {fileID: 945832017}
- component: {fileID: 7270464587938865433}
- component: {fileID: 1762185123217591013}
m_Layer: 0
m_Name: Vampire
m_TagString: Untagged
@ -38,6 +39,7 @@ Transform:
- {fileID: 5561158611004983940}
- {fileID: 8877496746214907228}
- {fileID: 1931588020511749739}
- {fileID: 903222670005920393}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -56,6 +58,13 @@ MonoBehaviour:
gameFlowManager: {fileID: 0}
stats: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2}
globalCamera: {fileID: 0}
jumpSource: {fileID: 7164870411903264125}
jumpSounds:
- {fileID: 8300000, guid: 2f93dc5371f10744ba49e29576e8a6a7, type: 3}
landSource: {fileID: 5290033541484811060}
landSounds:
- {fileID: 8300000, guid: 1376bbb24def5184393e893817fe41ca, type: 3}
soundManager: {fileID: 0}
--- !u!114 &3126145803593047825
MonoBehaviour:
m_ObjectHideFlags: 0
@ -85,6 +94,14 @@ MonoBehaviour:
deadColor: {r: 1, g: 0, b: 0, a: 1}
emptyColor: {r: 0.25490198, g: 0.25490198, b: 0.25490198, a: 0.7019608}
animator: {fileID: 0}
soundManager: {fileID: 0}
hurtSource: {fileID: 8033357406949758492}
deathSource: {fileID: 2647181308297321688}
hurtSounds:
- {fileID: 8300000, guid: f9d1af15829515644a12a3603c72335e, type: 3}
- {fileID: 8300000, guid: 5a5ca609f427205489f4ce369080e57f, type: 3}
deathSounds:
- {fileID: 8300000, guid: 4e2519f9a65bd484d95111774c762843, type: 3}
playerStats: {fileID: 11400000, guid: 12a626b5a296d934ba078d222ad6ba98, type: 2}
playerMovement: {fileID: 0}
--- !u!114 &1967503440015794769
@ -122,6 +139,13 @@ MonoBehaviour:
suckRange: 3
healthGainFromSuck: 30
bloodParticles: {fileID: 5815394732050939499}
suckingSource: {fileID: 4400190155669501391}
suckingSounds:
- {fileID: 8300000, guid: cae9a7c20818b7f4aa0761951e1b5b2b, type: 3}
suckSource: {fileID: 3555231741827846396}
suckSounds:
- {fileID: 8300000, guid: c12a57d990960ce44bc7cf4d5f63d32b, type: 3}
soundManager: {fileID: 0}
--- !u!114 &1214567908930553477
MonoBehaviour:
m_ObjectHideFlags: 0
@ -353,6 +377,50 @@ CapsuleCollider2D:
m_Offset: {x: 0, y: -0.25}
m_Size: {x: 1.25, y: 0.5}
m_Direction: 1
--- !u!81 &1762185123217591013
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1214567908930553593}
m_Enabled: 1
--- !u!1 &1436254125285932875
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 903222670005920393}
m_Layer: 0
m_Name: Audio Sources
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &903222670005920393
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1436254125285932875}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 3632678902316393644}
- {fileID: 8766613565529140840}
- {fileID: 6919064404994049919}
- {fileID: 7801168753088406092}
- {fileID: 4502282848150149069}
- {fileID: 1476073137437876612}
m_Father: {fileID: 1214567908930553594}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5124059627794595469
GameObject:
m_ObjectHideFlags: 0
@ -650,6 +718,408 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1478865402374041860
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 903222670005920393}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Land Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &1476073137437876612 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 1478865402374041860}
m_PrefabAsset: {fileID: 0}
--- !u!82 &5290033541484811060 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 1478865402374041860}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3643467873725871148
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 903222670005920393}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Hurt Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &3632678902316393644 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 3643467873725871148}
m_PrefabAsset: {fileID: 0}
--- !u!82 &8033357406949758492 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 3643467873725871148}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &4504372482479179597
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 903222670005920393}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Jump Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!82 &7164870411903264125 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 4504372482479179597}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4502282848150149069 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 4504372482479179597}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6988628843130902527
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 903222670005920393}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Sucking Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &6919064404994049919 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 6988628843130902527}
m_PrefabAsset: {fileID: 0}
--- !u!82 &4400190155669501391 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 6988628843130902527}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7834782494696387276
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 903222670005920393}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Suck Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &7801168753088406092 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 7834782494696387276}
m_PrefabAsset: {fileID: 0}
--- !u!82 &3555231741827846396 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 7834782494696387276}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8741671706484653800
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 903222670005920393}
m_Modifications:
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6915619910278317271, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
propertyPath: m_Name
value: Death Source
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
--- !u!4 &8766613565529140840 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 70347360213241984, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 8741671706484653800}
m_PrefabAsset: {fileID: 0}
--- !u!82 &2647181308297321688 stripped
AudioSource:
m_CorrespondingSourceObject: {fileID: 6767790137851257392, guid: 8929857cf558a9b40a30682dc94048ad, type: 3}
m_PrefabInstance: {fileID: 8741671706484653800}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &9176030194975883919
PrefabInstance:
m_ObjectHideFlags: 0
@ -707,13 +1177,13 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3}
--- !u!4 &8877496746214907228 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 316653409112989651, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3}
m_PrefabInstance: {fileID: 9176030194975883919}
m_PrefabAsset: {fileID: 0}
--- !u!198 &5815394732050939499 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 3450778120571403492, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3}
m_PrefabInstance: {fileID: 9176030194975883919}
m_PrefabAsset: {fileID: 0}
--- !u!4 &8877496746214907228 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 316653409112989651, guid: 78e4227a7fbb82040b8d8138dad79b1d, type: 3}
m_PrefabInstance: {fileID: 9176030194975883919}
m_PrefabAsset: {fileID: 0}

View File

@ -208,10 +208,6 @@ PrefabInstance:
propertyPath: m_Name
value: SceneStuff
objectReference: {fileID: 0}
- target: {fileID: 8365024802335227869, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
propertyPath: orthographic size
value: 10.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f7f5d2b1228d13f4d9015073aced3e81, type: 3}
--- !u!4 &720678398 stripped

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9145057a34a60964eb8cc79037227889
guid: 8b8f40b774485ae4588cba2c53f8ac9d
DefaultImporter:
externalObjects: {}
userData:

View File

@ -4,6 +4,11 @@ using System.Collections;
using UnityEngine.Serialization;
public class AIEntity : Entity {
[SerializeField] protected AudioSource attackSource;
[SerializeField] protected AudioClip[] attackSounds;
[FormerlySerializedAs("stats")]
[SerializeField]
public AIStats AIStats = null!;
@ -72,12 +77,12 @@ public class AIEntity : Entity {
return enemies.HasFlag(other.entityType) && other.IsAlive();
}
override public bool TakeDamage(float amount, Entity other) {
override public bool TakeDamage(float amount, Entity other, bool sound=true) {
//TODO Should we warn if target is null here?
if (target != null && target.GetComponent<VampireEntity>() is { })
target = other.transform;
return base.TakeDamage(amount, other);
return base.TakeDamage(amount, other, sound);
}
#region Flip
@ -120,7 +125,6 @@ public class AIEntity : Entity {
RaycastHit2D hit = Physics2D.Raycast(transform.position, direction, attackRange, (1 << LayerMask.NameToLayer("Safezone")));//Layer 6 is safeZone
Physics2D.queriesHitTriggers = true;
if(!(hit.collider is null)){ //We have hit the safe zone
//Debug.Log("hit");
isAvoiding = true;
Vector3 avoidDir = Vector3.zero;
//Between top and bottom
@ -254,7 +258,6 @@ public class AIEntity : Entity {
}
public override void EnterState() {
entity.animator.Play("Attack");
}
public override BaseState? UpdateState() {
@ -281,6 +284,8 @@ public class AIEntity : Entity {
private BaseState? Attack() {
Entity targetEntity = entity.target.GetComponent<Entity>();
if (targetEntity != null) {
entity.animator.Play("Attack");
entity.soundManager.PlaySound(entity.attackSource, entity.attackSounds, randomPitch: true, createTempSourceIfBusy: true);
targetEntity.TakeDamage(entity.attackDmg, entity);
bool isTargetAlive = targetEntity.IsAlive();
if (!isTargetAlive) {

View File

@ -12,29 +12,44 @@ public class Arena : MonoBehaviour {
public Vector2 direction;
}
[SerializeField] [Required]
[SerializeField]
[Required]
GameFlowManager gameFlowManager = null!;
//TODO Add some kind of "MinLength(1)" attribute
[SerializeField]
GladiatorEntrance[] spawners = null!;
[SerializeField] [Required]
[SerializeField]
[Required]
ArenaStats stats = null!;
[SerializeField] [Required]
[SerializeField]
[Required]
GameObject entityPrefab = null!;
[field: SerializeField] [field: Required]
[field: SerializeField]
[field: Required]
public Transform gladiatorParent { get; private set; } = null!;
[field: SerializeField] [field: Required]
[field: SerializeField]
[field: Required]
public Transform minionParent { get; private set; } = null!;
[field: SerializeField] [field: Required]
[field: SerializeField]
[field: Required]
public Transform graveyard { get; private set; } = null!;
SafeZone safeZone = null!;
[field: SerializeField] int currWaveSize = 0;
void Awake() => safeZone = GetComponentInChildren<SafeZone>();
[SerializeField] AudioSource waveSource;
[SerializeField] AudioClip[] waveSounds;
[HideInInspector] public SoundManager soundManager;
void Awake() {
safeZone = GetComponentInChildren<SafeZone>();
soundManager = FindObjectOfType<SoundManager>();
}
void Start() => gameFlowManager.stateChanged += OnGameFlowStateChanged;
@ -46,29 +61,37 @@ public class Arena : MonoBehaviour {
var gladiator = Instantiate(entityPrefab, gladiatorParent).GetComponent<Gladiator>();
gladiator.arena = this;
gladiator.transform.position = spawners[spawnerIndex].position;
float randFloat = Random.Range(0.1f, 0.5f);
Vector2 offset = new Vector2(randFloat, randFloat);
gladiator.transform.position = spawners[spawnerIndex].position + offset;
gladiator.direction = spawners[spawnerIndex].direction;
gladiator.gameFlowManager = gameFlowManager;
}
IEnumerator SpawnEnemies() {
yield return new WaitForSeconds(stats.initWaitToSpawn);
currWaveSize = stats.initWaveSize;
int currentSpawner = 0;
int amountSpawned = 0;
while(true){
while (amountSpawned < stats.waveSize) {
int wave = 1;
while (true) {
soundManager.PlaySound(waveSource, waveSounds, randomPitch: true, createTempSourceIfBusy: true);
while (amountSpawned < currWaveSize) {
currentSpawner = Random.Range(0, spawners.Length);
SpawnEnemy(currentSpawner);
amountSpawned++;
}
yield return new WaitForSeconds(stats.secondsBetweenSpawners);
if (wave++ >= stats.increaseWaveStep) {
if ((currWaveSize += stats.waveIncrease) > stats.maxWaveSize) currWaveSize = stats.maxWaveSize;
}
amountSpawned = 0;
yield return new WaitForSeconds(stats.secondsBetweenSpawners);
}
}
public Vector3 GetMoatExtents(){
public Vector3 GetMoatExtents() {
return safeZone.GetMoatExtents();
}

View File

@ -4,6 +4,9 @@
public class ArenaStats : ScriptableObject {
[Min(0f)] public float secondsBetweenSpawners = 3f;
[Min(0f)] public float initWaitToSpawn = 3f;
[Min(0f)] public float waveSize = 3f;
[Min(0f)] public int initWaveSize = 3;
[Min(0f)] public int maxWaveSize = 10;
[Min(0f), Tooltip("The amount of gladiator to add to wave")] public int waveIncrease = 1;
[Min(0f), Tooltip("How many waves before we increase by WaveIncrease")] public int increaseWaveStep = 3;
}

View File

@ -9,15 +9,21 @@ public class BloodSucker : MonoBehaviour {
[SerializeField] float suckRange = 1f;
[SerializeField] float healthGainFromSuck = 30f;
[SerializeField] ParticleSystem bloodParticles;
[SerializeField] AudioSource suckingSource;
[SerializeField] AudioClip[] suckingSounds;
[SerializeField] AudioSource suckSource;
[SerializeField] AudioClip[] suckSounds;
Entity currentTarget;
VampireEntity vampireEntity;
bool isSucking;
float currentSuckTimer;
[HideInInspector] public SoundManager soundManager;
void Awake() {
vampireEntity = GetComponent<VampireEntity>();
bloodParticles.Stop(true, ParticleSystemStopBehavior.StopEmitting);
soundManager = FindObjectOfType<SoundManager>();
}
void FixedUpdate() {
@ -95,6 +101,7 @@ public class BloodSucker : MonoBehaviour {
currentTarget.bloodTokens -= 1;
vampireEntity.HealDamage(healthGainFromSuck);
// print("One token sucked");
soundManager.PlaySound(suckSource, suckSounds, randomPitch:true, createTempSourceIfBusy:true);
if (currentTarget.bloodTokens == 0) {
SetIsSucking(false);
SetTarget(null);
@ -110,9 +117,11 @@ public class BloodSucker : MonoBehaviour {
if(isSucking) {
bloodParticles.Play();
currentTarget.OnSuck(true);
soundManager.PlaySound(suckingSource, suckingSounds, randomPitch: true, createTempSourceIfBusy: false);
} else {
bloodParticles.Stop(true, ParticleSystemStopBehavior.StopEmitting);
if(!(currentTarget is null))currentTarget.OnSuck(false);
soundManager.StopSound(suckingSource);
}
}

View File

@ -16,13 +16,14 @@ public class Entity : MonoBehaviour {
public Arena arena = null!;
[SerializeField] [Required]
[SerializeField]
[Required]
public GameFlowManager gameFlowManager = null!;
[field: SerializeField] public float Health { get; private set; }
[Min(10f)]
protected float initialHealth;
[SerializeField] [Required] protected HealthBar healthBar;
[SerializeField][Required] protected HealthBar healthBar;
bool isAlive = true;
public int bloodTokens = 1;
[field: SerializeField] public float movementSpeed { get; private set; }
@ -37,17 +38,23 @@ public class Entity : MonoBehaviour {
public Vector3 direction { get; set; }
public Rigidbody2D rb { get; private set; } = null!;
public new Collider2D collider { get; private set; } = null!;
[field: SerializeField] [field: Required]public new SpriteRenderer renderer { get; private set; }
[field: SerializeField][field: Required] public new SpriteRenderer renderer { get; private set; }
[SerializeField] GameObject halo;
[SerializeField] protected Color deadColor = Color.red;
[SerializeField] protected Color emptyColor = Color.grey;
[HideInInspector] public Animator animator;
bool beingSucked;
[HideInInspector] public SoundManager soundManager;
[SerializeField] protected AudioSource hurtSource;
[SerializeField] protected AudioSource deathSource;
[SerializeField] protected AudioClip[] hurtSounds;
[SerializeField] protected AudioClip[] deathSounds;
virtual protected void Awake(){
virtual protected void Awake() {
rb = GetComponent<Rigidbody2D>();
collider = GetComponent<Collider2D>();
animator = GetComponentInChildren<Animator>();
soundManager = FindObjectOfType<SoundManager>();
}
protected virtual void Start() {
@ -64,7 +71,7 @@ public class Entity : MonoBehaviour {
protected virtual void Update() { }
protected virtual void FixedUpdate() {}
protected virtual void FixedUpdate() { }
protected void OnDestroy() => gameFlowManager.stateChanged -= OnGameFlowStateChanged;
@ -86,7 +93,7 @@ public class Entity : MonoBehaviour {
}
//Apply damage to the entity, returns true if it is still alive
public virtual bool TakeDamage(float amount, Entity other) {
public virtual bool TakeDamage(float amount, Entity other, bool sound = true) {
Health -= amount;
healthBar.SetHealthFraction(Health / initialHealth);
@ -94,6 +101,10 @@ public class Entity : MonoBehaviour {
OnDied();
return false;
}
if (sound) {
soundManager.PlaySound(hurtSource, hurtSounds, randomPitch: true, createTempSourceIfBusy: true);
}
return true;
}
@ -101,7 +112,7 @@ public class Entity : MonoBehaviour {
Health += amount;
healthBar.SetHealthFraction(Health / initialHealth);
if(Health > initialHealth) {
if (Health > initialHealth) {
Health = initialHealth;
}
}
@ -121,34 +132,35 @@ public class Entity : MonoBehaviour {
}
protected virtual void OnDied() {
soundManager.PlaySound(deathSource, deathSounds, randomPitch: true, createTempSourceIfBusy: true);
isAlive = false;
if(!(collider is null)){
if (!(collider is null)) {
collider.isTrigger = true;
}
if(!(rb is null)){
if (!(rb is null)) {
rb.isKinematic = true;
rb.velocity = Vector2.zero;
}
healthBar.gameObject.SetActive(false);
if(bloodTokens > 0){
if (bloodTokens > 0) {
renderer.color = deadColor;
renderer.sortingOrder = -1;
}else{
} else {
renderer.color = emptyColor;
renderer.sortingOrder = -2;
}
}
protected virtual void OnEmpty(){
protected virtual void OnEmpty() {
renderer.color = emptyColor;
renderer.sortingOrder = -2;
}
public void OnSuck(bool val){
public void OnSuck(bool val) {
beingSucked = val;
}
public bool IsBeingSucked(){
public bool IsBeingSucked() {
return beingSucked;
}
public void EnableHalo() {

View File

@ -22,6 +22,12 @@ public class PlayerMovement : MonoBehaviour {
Animator animator = null!;
public bool facingRight { get; private set; } = true;
[SerializeField] AudioSource jumpSource;
[SerializeField] AudioClip[] jumpSounds;
[SerializeField] AudioSource landSource;
[SerializeField] AudioClip[] landSounds;
[HideInInspector] public SoundManager soundManager;
bool lastJumpButton;
public bool IsInSafeZone => currentState is ImmobileMovementState;
@ -33,6 +39,7 @@ public class PlayerMovement : MonoBehaviour {
vampireEntity = GetComponent<VampireEntity>();
animator = GetComponentInChildren<Animator>();
currentState = new ImmobileMovementState(this);
soundManager = FindObjectOfType<SoundManager>();
}
void Start() {
@ -185,10 +192,12 @@ public class PlayerMovement : MonoBehaviour {
startTime = Time.time;
// playerMovement.animator.SetBool("Jumping", true);
playerMovement.animator.Play("Player_Jump");
playerMovement.soundManager.PlaySound(playerMovement.jumpSource, playerMovement.jumpSounds, randomPitch: true, createTempSourceIfBusy: true);
}
public override void LeaveState() {
// playerMovement.animator.SetBool("Jumping", false);
playerMovement.animator.Play("Player_Idle");
playerMovement.soundManager.PlaySound(playerMovement.landSource, playerMovement.landSounds, randomPitch: true, createTempSourceIfBusy: true);
}
public override BaseState? FixedUpdateState() {
@ -236,7 +245,7 @@ public class PlayerMovement : MonoBehaviour {
}
public override void LeaveState() {
base.EnterState();
base.LeaveState();
playerMovement.rb.SetEnabled(true);
}

View File

@ -59,9 +59,11 @@ public class SoundManager : MonoBehaviour {
}
IEnumerator CreateTempSource(AudioSource refSource, float delay=0f) {
AudioSource newSource = gameObject.AddComponent<AudioSource>();
AudioSource newSource = refSource.gameObject.AddComponent<AudioSource>();
newSource.volume = refSource.volume;
newSource.clip = refSource.clip;
newSource.spatialize = refSource.spatialize;
newSource.spatialBlend = refSource.spatialBlend;
PlaySound(newSource, delay:delay);
@ -79,6 +81,10 @@ public class SoundManager : MonoBehaviour {
}
}
public void StopSound(AudioSource source) {
source.Stop();
}
IEnumerator DelayedPlaySound(AudioSource source, float delay) {
yield return new WaitForSeconds(delay);

View File

@ -24,7 +24,7 @@ public class VampireEntity : Entity {
base.Update();
if (gameFlowManager.CanDoAction)
TakeDamage(playerStats.bloodLossRate * Time.deltaTime, this);
TakeDamage(playerStats.bloodLossRate * Time.deltaTime, this, sound:false);
}
// public override void TakeDamage(float amount) {

View File

@ -238,7 +238,18 @@
{
"name": "",
"id": "d325e36d-0a45-4f07-968e-7d1f67d80899",
"path": "<Keyboard>/e",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Suck",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "6d6b0cf1-60af-4bf9-bb3d-5ed163e669fc",
"path": "<Mouse>/leftButton",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -312,6 +323,17 @@
"isComposite": false,
"isPartOfComposite": true
},
{
"name": "",
"id": "cc59ae2e-998f-4c7b-a5cc-4a164aedfe2d",
"path": "<Mouse>/scroll/y",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "SwitchMinion",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "4715f838-717a-4f10-a668-05a6d761a7bc",
@ -388,6 +410,17 @@
"action": "Throw",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "70991f2d-c585-4b19-bf50-8c9757aab592",
"path": "<Mouse>/rightButton",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "Throw",
"isComposite": false,
"isPartOfComposite": false
}
]
},