diff --git a/Assets/Resources/Prefabs/Mobs/Dummy/DamagingHitbox.prefab b/Assets/Resources/Prefabs/Mobs/Dummy/DamagingHitbox.prefab
index b26df103084977e851a50eef0d2e9a1474926209..d6e3a3353fa91bd4edc702997a07ef1425316d1f 100644
--- a/Assets/Resources/Prefabs/Mobs/Dummy/DamagingHitbox.prefab
+++ b/Assets/Resources/Prefabs/Mobs/Dummy/DamagingHitbox.prefab
@@ -66,5 +66,5 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d305728f9c09ee84d861e4d2a18c0be0, type: 3}
m_Name:
m_EditorClassIdentifier:
- damage: 0
+ damage: 10
knockbackPower: 10
diff --git a/Assets/_Resources/Audio.meta b/Assets/_Resources/Audio.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4d74c2bbe495c2ef21fa436ae8feea397dd3ec0a
--- /dev/null
+++ b/Assets/_Resources/Audio.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a427b3618d041e749a3a61578e34902a
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Audio/gunshot1.mp3 b/Assets/_Resources/Audio/gunshot1.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..98931298ee02492366328400da26609724316d44
Binary files /dev/null and b/Assets/_Resources/Audio/gunshot1.mp3 differ
diff --git a/Assets/_Resources/Audio/gunshot1.mp3.meta b/Assets/_Resources/Audio/gunshot1.mp3.meta
new file mode 100644
index 0000000000000000000000000000000000000000..892e54223a021d68294d1ba03aa8dd319d8f1728
--- /dev/null
+++ b/Assets/_Resources/Audio/gunshot1.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: e0e502addea969a4babeb4fd434f4a96
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Audio/running1.mp3 b/Assets/_Resources/Audio/running1.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..34c076d1f797b35d1aeacdeee9c7e394dbffba07
Binary files /dev/null and b/Assets/_Resources/Audio/running1.mp3 differ
diff --git a/Assets/_Resources/Audio/running1.mp3.meta b/Assets/_Resources/Audio/running1.mp3.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1032cb58725eb83cb9891662b7384336c146fe82
--- /dev/null
+++ b/Assets/_Resources/Audio/running1.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: b9e24ef7487e44b45bbb1368e02035ac
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Audio/step1.mp3 b/Assets/_Resources/Audio/step1.mp3
new file mode 100644
index 0000000000000000000000000000000000000000..9c4df7a03016ea2fa2619aeb445290c91dc92a78
Binary files /dev/null and b/Assets/_Resources/Audio/step1.mp3 differ
diff --git a/Assets/_Resources/Audio/step1.mp3.meta b/Assets/_Resources/Audio/step1.mp3.meta
new file mode 100644
index 0000000000000000000000000000000000000000..447b47a3de80a3670fc7e45464a38e86632d9581
--- /dev/null
+++ b/Assets/_Resources/Audio/step1.mp3.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: cef239db9c6dbe34f9ddf0f79d1cd768
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Animations/JeanModel.controller b/Assets/_Resources/Models/Characters/Jean/Animations/JeanModel.controller
index 7b9a99a93e393292b0e9283f5999c8ffa20adbe0..be75ae5b0db956f63af5a1f8f144d8e81bb8ae26 100644
--- a/Assets/_Resources/Models/Characters/Jean/Animations/JeanModel.controller
+++ b/Assets/_Resources/Models/Characters/Jean/Animations/JeanModel.controller
@@ -331,6 +331,9 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: Jump_param
m_EventTreshold: 0
+ - m_ConditionMode: 7
+ m_ConditionEvent: Movement_param
+ m_EventTreshold: 65536
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 5620321516135497345}
m_Solo: 0
@@ -459,6 +462,9 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: Skill_param
m_EventTreshold: 0
+ - m_ConditionMode: 7
+ m_ConditionEvent: Movement_param
+ m_EventTreshold: 65536
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8229387981759705845}
m_Solo: 0
@@ -862,19 +868,19 @@ AnimatorController:
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: Jump_param
- m_Type: 4
+ - m_Name: Skill_param
+ m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: Skill_param
+ - m_Name: Dead_param
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 9100000}
- - m_Name: Dead_param
+ - m_Name: Jump_param
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
@@ -1225,6 +1231,9 @@ AnimatorStateTransition:
- m_ConditionMode: 1
m_ConditionEvent: Hit_param
m_EventTreshold: 0
+ - m_ConditionMode: 7
+ m_ConditionEvent: Movement_param
+ m_EventTreshold: 65536
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 7585042452573995246}
m_Solo: 0
diff --git a/Assets/_Resources/Models/Characters/Jean/Animations/RunningShooting.anim b/Assets/_Resources/Models/Characters/Jean/Animations/RunningShooting.anim
index 635fed24556ce800d2efc41f944651d8cb7709eb..b8f9fba1b0c2e8f06a78a9464346c2c7004b3424 100644
--- a/Assets/_Resources/Models/Characters/Jean/Animations/RunningShooting.anim
+++ b/Assets/_Resources/Models/Characters/Jean/Animations/RunningShooting.anim
@@ -86729,7 +86729,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: {x: -0.15602696, y: -0.1565295, z: 0.6646638, w: 0.71370596}
+ value: {x: -0.051192507, y: -0.25161073, z: 0.681754, w: 0.6850422}
inSlope: {x: 0, y: 0, z: 0, w: 0}
outSlope: {x: 0.000024164046, y: 0.000024164046, z: 0, w: 0}
tangentMode: 0
@@ -86738,8 +86738,8 @@ AnimationClip:
outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334, w: 0.33333334}
- serializedVersion: 3
time: 1.2333332
- value: {x: -0.14440322, y: -0.1440498, z: 0.66728556, w: 0.716329}
- inSlope: {x: 0.000024164046, y: 0.00003624607, z: 0, w: 0}
+ value: {x: -0.039286464, y: -0.23961678, z: 0.6825436, w: 0.6893291}
+ inSlope: {x: 0.000024164046, y: 0.000024164046, z: 0, w: 0}
outSlope: {x: 0, y: 0, z: 0, w: 0}
tangentMode: 0
weightedMode: 0
@@ -860354,7 +860354,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -0.15602696
+ value: -0.051192507
inSlope: 0
outSlope: 0.000024164046
tangentMode: 0
@@ -860363,7 +860363,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.2333332
- value: -0.14440322
+ value: -0.039286464
inSlope: 0.000024164046
outSlope: 0
tangentMode: 0
@@ -860384,7 +860384,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -0.1565295
+ value: -0.25161073
inSlope: 0
outSlope: 0.000024164046
tangentMode: 0
@@ -860393,8 +860393,8 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.2333332
- value: -0.1440498
- inSlope: 0.00003624607
+ value: -0.23961678
+ inSlope: 0.000024164046
outSlope: 0
tangentMode: 0
weightedMode: 0
@@ -860414,7 +860414,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0.6646638
+ value: 0.681754
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -860423,7 +860423,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.2333332
- value: 0.66728556
+ value: 0.6825436
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -860444,7 +860444,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 0.71370596
+ value: 0.6850422
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -860453,7 +860453,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.2333332
- value: 0.716329
+ value: 0.6893291
inSlope: 0
outSlope: 0
tangentMode: 0
@@ -869223,7 +869223,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: -0.838595
+ value: 15.839
inSlope: 0.00000608934
outSlope: 0.00000608934
tangentMode: 0
@@ -869232,7 +869232,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.2333332
- value: -0.838595
+ value: 15.839
inSlope: 0.00000608934
outSlope: 0.00000608934
tangentMode: 0
@@ -869283,7 +869283,7 @@ AnimationClip:
m_Curve:
- serializedVersion: 3
time: 0
- value: 86.11451
+ value: 86.115
inSlope: -0.000018557988
outSlope: -0.000018557988
tangentMode: 0
@@ -869292,7 +869292,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1.2333332
- value: 86.11451
+ value: 86.115
inSlope: -0.000018557988
outSlope: -0.000018557988
tangentMode: 0
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio.meta b/Assets/_Resources/Models/Characters/Jean/Audio.meta
new file mode 100644
index 0000000000000000000000000000000000000000..1d225b9c046e804f0b2cf966208385f043796ff2
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 056d4448bdbd76a4ab8bb04e5f690980
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack1.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/attack1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..6acbd7fe94f69f5e7b70a82ef2a5147ae647d4e9
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/attack1.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack1.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/attack1.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..0a6feca4839ae15d4d3f0b3023f0ea8c4d9c6fce
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/attack1.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: a5aead902c4eb424bb859275c70771f6
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack2.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/attack2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..69892889f663a59a57cf29cefe24a9352ea12569
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/attack2.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack2.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/attack2.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ff22c655617a5a21ff3d243efa10f2fcb394b17e
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/attack2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: abe305ac85823d344a3929fe90931c79
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack3.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/attack3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..dcf84a9a83d39ba10cc8d89e1900d88dd95c538e
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/attack3.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack3.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/attack3.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..6a0e10478ecf3ea6d3f98ef960217a603e3259c9
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/attack3.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 7afac64ab61c6d04bac2210fdc3959fc
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack4.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/attack4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..b75c936b8f97315bb92588537f513835adbaf5df
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/attack4.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack4.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/attack4.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c5b43d430011abc0ff394b67b969350f721bea83
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/attack4.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: f977b19e94f4df94db81aedc78cb9682
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack5.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/attack5.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..fee286029d2caaf02c403dd11d0edd797b27c801
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/attack5.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/attack5.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/attack5.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..78074c2681de6b557c731313aadfdafbca7cffa3
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/attack5.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: ddc33377d2ba5424899a688cb23f2116
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead1.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/dead1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..57c3359c76ae68c9f98d59747b014ee8951b17ff
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/dead1.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead1.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/dead1.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..570b1c0c60f7cd4595039ca24acee27265abe7cf
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/dead1.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 18647a5a123a5b14ead19cdb0d99160e
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead2.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/dead2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..306042c1f91bc7bb478de7e3334691c6dbd7f785
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/dead2.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead2.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/dead2.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e37fa642148b6746d33d28dbd7156abb655bd4fe
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/dead2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 90615f980c1d12844ac01bd19c638f43
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead3.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/dead3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..4ca5e059e02441de602ec67b0d4eded9a9751408
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/dead3.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead3.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/dead3.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2ca950ad688b35d8472dd1e921822dd23aa11174
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/dead3.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: f428e164ac65c4847af927ca3ae3710b
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead4.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/dead4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..ea515095b89a73df06f5fbd5dffa6525b3caedbb
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/dead4.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/dead4.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/dead4.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..218abe043adcbad1b31c84dc122fcfed1a8438ea
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/dead4.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 948484ed4d8024d48b3a7714e2b23cc4
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit 6.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/hit 6.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..ececf390a3f6fe04e946424de11916cb7da14b51
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/hit 6.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit 6.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/hit 6.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..6ba10abc2e8b350279ed166741d5a49a5969c074
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/hit 6.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: eacf0a91bf7748e4bbcae97779c8e8fc
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit1.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/hit1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..1dd6163c4df2c3ae10d8d77658d1258a030b31ed
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/hit1.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit1.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/hit1.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..d6b1c002ddea00472775ea1a0ed2f8fcbf343267
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/hit1.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 6a720d3738d1c324382e0c0a88afb491
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit2.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/hit2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..7f3593a70a18d4609157247f9e0d3d3747783c8e
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/hit2.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit2.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/hit2.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..230e26fe6c866aceae8851f8dfb4197a3d6ab4bd
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/hit2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 411efe6f4af782946adf2d8e8097ec0b
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit3.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/hit3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..6900463879bfaccb15652bee1347daf70a8a4744
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/hit3.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit3.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/hit3.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2604daae07b842090fa08b8d8368397e94fc8c34
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/hit3.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: cf195e6651c28054da7382d1950c1ec8
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit4.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/hit4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..cd878fc6f80dbfa38b2d623632b418d7959690f5
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/hit4.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit4.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/hit4.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..38c71d99f9134f2329ab164844caf4d6691526ea
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/hit4.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 33c01aa1bd14afa40930bac21ba8bb7f
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit5.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/hit5.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..12dbdca2e6298c7ce0a31bd7b2b67c2937d3d78a
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/hit5.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/hit5.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/hit5.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..c6103483ca1cfa8e409b23be53846cf0d4e87433
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/hit5.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 6e24a3f2a36a0464ea52ce0c0e60e942
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump1.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/jump1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..2a4549fc1727e255184857c338af12b805ea9321
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/jump1.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump1.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/jump1.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4347da2d554fe5add35eb8fed244af5f8747b338
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/jump1.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: c69ea4a3fe20c0b4db95023d1b3134b3
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump2.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/jump2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..ecfcc755677a2422a9e539cfac3219d1702bdeea
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/jump2.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump2.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/jump2.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..e96f11a06acdbf5516ce1b74ea42bf9873cae355
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/jump2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: a35500cf5a1467040a453e20bd45a6b2
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump3.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/jump3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..7533be8787b765d2604b0cc814a174f224b26cd0
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/jump3.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump3.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/jump3.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..2b3238b5465ab4b95e8686570765d64da6297d84
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/jump3.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: f638ae828b15620448f8240260ea3fc8
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump4.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/jump4.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..a9f75e9bfcd7c8bec813fcf31a0bb23f495b1905
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/jump4.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump4.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/jump4.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..eae8f648186e0043623ed42501c7a61ba1452ab4
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/jump4.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 277cff3c2f253904985c2e6b3d72e2f2
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump5.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/jump5.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..4028dc7c582ff3a95195b3ee932b542759158e11
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/jump5.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/jump5.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/jump5.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..813c50d1570f7bdf8583f8c96533637a1122c351
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/jump5.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: babfcbc3052e27c478957fd5201b1e8e
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/skill1.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/skill1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..84e94775498c98e83bc5dab622045875cf6d17b5
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/skill1.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/skill1.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/skill1.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..989cc9d45792e70ba76fdd8f665255da686ebf36
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/skill1.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: d71c7fddb8a8ea047896825d40f638e4
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/skill2.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/skill2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..27ffd58201bd6135797dffbca7dc17ef330b4e46
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/skill2.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/skill2.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/skill2.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..4461c279c2d6327f2da10fa082774f553d7e8032
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/skill2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 076a5506f291b364e96009b74257fc6c
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/skill3.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/skill3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..383bae2f75492301865f0887d9cd7d0c8ab5a692
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/skill3.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/skill3.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/skill3.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..7ba3fd7da266ffeb58b46a8b4002236a1d747e5d
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/skill3.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: cf6da4d8ad74aed48bac1d21ecf8f842
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/sprint1.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/sprint1.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..34ff4f43b51e6e3bf906743e76a3eba9b1216c82
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/sprint1.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/sprint1.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/sprint1.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..f519c59f01880c0ebf00a598515dc871d8b050f9
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/sprint1.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 9474d9928650bc8438437e74b46b19b5
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/sprint2.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/sprint2.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..7e1e7ddbe421cb2f8d80e3a724ac836f60fe41e1
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/sprint2.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/sprint2.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/sprint2.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..43e953d8696f31b5c1df2bf097bfa9c2baadd17e
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/sprint2.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: ba57ba854e3b91049afa3190f715b5b7
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/sprint3.ogg b/Assets/_Resources/Models/Characters/Jean/Audio/sprint3.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..938b5b7535689a3330e7a2fe49f3124014192bfa
Binary files /dev/null and b/Assets/_Resources/Models/Characters/Jean/Audio/sprint3.ogg differ
diff --git a/Assets/_Resources/Models/Characters/Jean/Audio/sprint3.ogg.meta b/Assets/_Resources/Models/Characters/Jean/Audio/sprint3.ogg.meta
new file mode 100644
index 0000000000000000000000000000000000000000..ff1a0a2ef7e7d27fefe8ce424eab2bfc82e46564
--- /dev/null
+++ b/Assets/_Resources/Models/Characters/Jean/Audio/sprint3.ogg.meta
@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: c9a0d18edfaba144780ce49f35017683
+AudioImporter:
+ externalObjects: {}
+ serializedVersion: 7
+ defaultSettings:
+ serializedVersion: 2
+ loadType: 0
+ sampleRateSetting: 0
+ sampleRateOverride: 44100
+ compressionFormat: 1
+ quality: 1
+ conversionMode: 0
+ preloadAudioData: 0
+ platformSettingOverrides: {}
+ forceToMono: 0
+ normalize: 1
+ loadInBackground: 0
+ ambisonic: 0
+ 3D: 1
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/_Scenes/Level-1.unity b/Assets/_Scenes/Level-1.unity
index 1c4b09034265af9d16f67085aa91ebcc16c8b587..dc2124504d5164d02fb32c3d9f964a93c800bd4c 100644
--- a/Assets/_Scenes/Level-1.unity
+++ b/Assets/_Scenes/Level-1.unity
@@ -6147,6 +6147,102 @@ MonoBehaviour:
- EdgeIndices: 14000000150000001600000017000000
TexGenIndex: 5
Generation: 102
+--- !u!1 &350155936
+GameObject:
+ m_ObjectHideFlags: 17
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 350155939}
+ - component: {fileID: 350155938}
+ - component: {fileID: 350155937}
+ m_Layer: 0
+ m_Name: '[default-CSGModel]'
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 124
+ m_IsActive: 1
+--- !u!54 &350155937
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 350155936}
+ serializedVersion: 4
+ m_Mass: 1
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_CenterOfMass: {x: 0, y: 0, z: 0}
+ m_InertiaTensor: {x: 1, y: 1, z: 1}
+ m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ImplicitCom: 1
+ m_ImplicitTensor: 1
+ m_UseGravity: 0
+ m_IsKinematic: 1
+ m_Interpolate: 0
+ m_Constraints: 126
+ m_CollisionDetection: 0
+--- !u!114 &350155938
+MonoBehaviour:
+ m_ObjectHideFlags: 17
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 350155936}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8672dcc90e16b0a489a41edf56e016f8, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ PrefabBehaviour: 0
+ PrefabSourceAlignment: 4
+ PrefabDestinationAlignment: 0
+ Version: 1.1
+ infiniteBrush: {fileID: 0}
+ Settings: 1025
+ VertexChannels: 14
+ ReceiveGI: 2
+ MeshColliderCookingOptions: 14
+ ShowGeneratedMeshes: 0
+ DefaultPhysicsMaterial: {fileID: 13400000, guid: 0c5fdfb44d6f19646a41a0720fbf751a, type: 2}
+ exportType: 0
+ originType: 0
+ exportColliders: 0
+ exportPath:
+ angleError: 1
+ areaError: 1
+ hardAngle: 60
+ packMargin: 20
+ scaleInLightmap: 1
+ autoUVMaxDistance: 0.5
+ autoUVMaxAngle: 89
+ minimumChartSize: 4
+--- !u!4 &350155939
+Transform:
+ m_ObjectHideFlags: 17
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 350155936}
+ serializedVersion: 2
+ 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_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 1055458805}
+ m_Father: {fileID: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &354420147
GameObject:
m_ObjectHideFlags: 0
@@ -17049,6 +17145,53 @@ MonoBehaviour:
- EdgeIndices: 14000000150000001600000017000000
TexGenIndex: 5
Generation: 103
+--- !u!1 &1055458804
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1055458805}
+ - component: {fileID: 1055458806}
+ m_Layer: 0
+ m_Name: '[generated-meshes]'
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1055458805
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1055458804}
+ serializedVersion: 2
+ 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_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 350155939}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1055458806
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1055458804}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5c3643d4978096d4880d7edbf4f65a50, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ Version: 1
+ owner: {fileID: 350155938}
+ helperSurfaces: []
--- !u!1 &1058284600
GameObject:
m_ObjectHideFlags: 0
@@ -17322,10 +17465,6 @@ PrefabInstance:
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 5826087942536862604, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
- propertyPath: damage
- value: 50
- objectReference: {fileID: 0}
- target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
propertyPath: m_LocalPosition.x
value: -1.59
@@ -23555,6 +23694,218 @@ MonoBehaviour:
- {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3}
companionList: []
companionActive:
+ animationController:
+ model: {fileID: 0}
+ renderer: {fileID: 0}
+ animator: {fileID: 0}
+ inputController:
+ movementInputX: 0
+ movementInputZ: 0
+ movementInputScroll: 0
+ movementInputJump: 0
+ stateController:
+ weaponState: 0
+ audioController:
+ audios:
+ - source: {fileID: 0}
+ name: running_1
+ clip: {fileID: 8300000, guid: b9e24ef7487e44b45bbb1368e02035ac, type: 3}
+ volume: 0.5
+ pitch: 1
+ loop: 1
+ spatialize: 1
+ - source: {fileID: 0}
+ name: walking_1
+ clip: {fileID: 8300000, guid: cef239db9c6dbe34f9ddf0f79d1cd768, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 1
+ spatialize: 1
+ - source: {fileID: 0}
+ name: attack_1
+ clip: {fileID: 8300000, guid: a5aead902c4eb424bb859275c70771f6, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: attack_2
+ clip: {fileID: 8300000, guid: abe305ac85823d344a3929fe90931c79, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: attack_3
+ clip: {fileID: 8300000, guid: 7afac64ab61c6d04bac2210fdc3959fc, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: attack_4
+ clip: {fileID: 8300000, guid: f977b19e94f4df94db81aedc78cb9682, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: attack_5
+ clip: {fileID: 8300000, guid: ddc33377d2ba5424899a688cb23f2116, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: dead_1
+ clip: {fileID: 8300000, guid: 18647a5a123a5b14ead19cdb0d99160e, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: dead_2
+ clip: {fileID: 8300000, guid: 90615f980c1d12844ac01bd19c638f43, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: dead_3
+ clip: {fileID: 8300000, guid: f428e164ac65c4847af927ca3ae3710b, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: dead_4
+ clip: {fileID: 8300000, guid: 948484ed4d8024d48b3a7714e2b23cc4, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: hit_1
+ clip: {fileID: 8300000, guid: 6a720d3738d1c324382e0c0a88afb491, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: hit_2
+ clip: {fileID: 8300000, guid: 411efe6f4af782946adf2d8e8097ec0b, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: hit_3
+ clip: {fileID: 8300000, guid: cf195e6651c28054da7382d1950c1ec8, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: hit_4
+ clip: {fileID: 8300000, guid: 33c01aa1bd14afa40930bac21ba8bb7f, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: hit_5
+ clip: {fileID: 8300000, guid: 6e24a3f2a36a0464ea52ce0c0e60e942, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: hit_6
+ clip: {fileID: 8300000, guid: eacf0a91bf7748e4bbcae97779c8e8fc, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: jump_1
+ clip: {fileID: 8300000, guid: c69ea4a3fe20c0b4db95023d1b3134b3, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: jump_2
+ clip: {fileID: 8300000, guid: a35500cf5a1467040a453e20bd45a6b2, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: jump_3
+ clip: {fileID: 8300000, guid: f638ae828b15620448f8240260ea3fc8, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: jump_4
+ clip: {fileID: 8300000, guid: 277cff3c2f253904985c2e6b3d72e2f2, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: jump_5
+ clip: {fileID: 8300000, guid: babfcbc3052e27c478957fd5201b1e8e, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: skill_1
+ clip: {fileID: 8300000, guid: d71c7fddb8a8ea047896825d40f638e4, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: skill_2
+ clip: {fileID: 8300000, guid: 076a5506f291b364e96009b74257fc6c, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: skill_3
+ clip: {fileID: 8300000, guid: cf6da4d8ad74aed48bac1d21ecf8f842, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: sprint_1
+ clip: {fileID: 8300000, guid: 9474d9928650bc8438437e74b46b19b5, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: sprint_2
+ clip: {fileID: 8300000, guid: ba57ba854e3b91049afa3190f715b5b7, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ - source: {fileID: 0}
+ name: sprint_3
+ clip: {fileID: 8300000, guid: c9a0d18edfaba144780ce49f35017683, type: 3}
+ volume: 1
+ pitch: 1
+ loop: 0
+ spatialize: 0
+ stats:
+ sprintModifier: 0
+ snapshotSpeed: 0
--- !u!54 &1109856211
Rigidbody:
m_ObjectHideFlags: 0
@@ -25330,102 +25681,6 @@ MonoBehaviour:
- EdgeIndices: 07000000060000000500000004000000
TexGenIndex: 5
Generation: 2
---- !u!1 &1213055896
-GameObject:
- m_ObjectHideFlags: 17
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1213055899}
- - component: {fileID: 1213055898}
- - component: {fileID: 1213055897}
- m_Layer: 0
- m_Name: '[default-CSGModel]'
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 124
- m_IsActive: 1
---- !u!54 &1213055897
-Rigidbody:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1213055896}
- serializedVersion: 4
- m_Mass: 1
- m_Drag: 0
- m_AngularDrag: 0.05
- m_CenterOfMass: {x: 0, y: 0, z: 0}
- m_InertiaTensor: {x: 1, y: 1, z: 1}
- m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
- m_IncludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ExcludeLayers:
- serializedVersion: 2
- m_Bits: 0
- m_ImplicitCom: 1
- m_ImplicitTensor: 1
- m_UseGravity: 0
- m_IsKinematic: 1
- m_Interpolate: 0
- m_Constraints: 126
- m_CollisionDetection: 0
---- !u!114 &1213055898
-MonoBehaviour:
- m_ObjectHideFlags: 17
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1213055896}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 8672dcc90e16b0a489a41edf56e016f8, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- PrefabBehaviour: 0
- PrefabSourceAlignment: 4
- PrefabDestinationAlignment: 0
- Version: 1.1
- infiniteBrush: {fileID: 0}
- Settings: 1025
- VertexChannels: 14
- ReceiveGI: 2
- MeshColliderCookingOptions: 14
- ShowGeneratedMeshes: 0
- DefaultPhysicsMaterial: {fileID: 13400000, guid: 0c5fdfb44d6f19646a41a0720fbf751a, type: 2}
- exportType: 0
- originType: 0
- exportColliders: 0
- exportPath:
- angleError: 1
- areaError: 1
- hardAngle: 60
- packMargin: 20
- scaleInLightmap: 1
- autoUVMaxDistance: 0.5
- autoUVMaxAngle: 89
- minimumChartSize: 4
---- !u!4 &1213055899
-Transform:
- m_ObjectHideFlags: 17
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1213055896}
- serializedVersion: 2
- 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_ConstrainProportionsScale: 0
- m_Children:
- - {fileID: 1616070660}
- m_Father: {fileID: 0}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1217336569
GameObject:
m_ObjectHideFlags: 0
@@ -30322,53 +30577,6 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1616070659
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1616070660}
- - component: {fileID: 1616070661}
- m_Layer: 0
- m_Name: '[generated-meshes]'
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1616070660
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1616070659}
- serializedVersion: 2
- 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_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1213055899}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1616070661
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1616070659}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 5c3643d4978096d4880d7edbf4f65a50, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- Version: 1
- owner: {fileID: 1213055898}
- helperSurfaces: []
--- !u!43 &1632158666
Mesh:
m_ObjectHideFlags: 0
@@ -37981,4 +38189,4 @@ SceneRoots:
- {fileID: 1298502551}
- {fileID: 1607743606}
- {fileID: 440287453}
- - {fileID: 1213055899}
+ - {fileID: 350155939}
diff --git a/Assets/_Scripts/Core/Entities/Mobs/Dummy/Dummy.cs b/Assets/_Scripts/Core/Entities/Mobs/Dummy/Dummy.cs
index d33d6161740c242f0966949f3479f15aac1d9a8f..b77aa4a920be7d4789eb5a7975c4c5296c0bf45d 100644
--- a/Assets/_Scripts/Core/Entities/Mobs/Dummy/Dummy.cs
+++ b/Assets/_Scripts/Core/Entities/Mobs/Dummy/Dummy.cs
@@ -2,7 +2,7 @@ using UnityEngine;
public class Dummy : EnemyEntity
{
- // Static attributes
+ // Static Attributes
public const string ObjectIdPrefix = "Dummy";
// Attributes
diff --git a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs
index 9feff941d7c566df20cedc8340436bfa3a2eaa60..f4caa7c4745557135f68f8bb5d8e959bf514fe5c 100644
--- a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs
+++ b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeapon.cs
@@ -11,12 +11,14 @@ public class TestWeapon : WeaponObject
public float fireRange = 100;
public float projectileSpeed = 100;
public TestWeaponAnimationController animationController;
+ public AudioController audioController;
// Constructor
protected new void Start()
{
base.Start();
animationController = new TestWeaponAnimationController(this);
+ audioController = new AudioController(gameObject, audioController.audios);
}
// Function
diff --git a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeaponAnimationController.cs b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeaponAnimationController.cs
index 7b33a22e7e8ae56b0cf11b323c97c55bab814b7c..c7245969143669037c50d5d7c3abc1b37e6760a1 100644
--- a/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeaponAnimationController.cs
+++ b/Assets/_Scripts/Core/Objects/Weapons/TestWeapon/TestWeaponAnimationController.cs
@@ -1,5 +1,7 @@
+using System;
using UnityEngine;
+[Serializable]
public class TestWeaponAnimationController : AnimationController
{
// Consts
diff --git a/Assets/_Scripts/Core/Player/Player.cs b/Assets/_Scripts/Core/Player/Player.cs
index 2bdfd538cf01599db69720c8b8918f82925712c9..bd4a317947393c07b3d864d02e56fe8e29c60226 100644
--- a/Assets/_Scripts/Core/Player/Player.cs
+++ b/Assets/_Scripts/Core/Player/Player.cs
@@ -19,6 +19,8 @@ public class Player : PlayerEntity
// Constructor
new void Start()
{
+ gameObject.AddComponent<AudioSource>();
+
base.Start();
SetIdPrefix(ObjectIdPrefix);
Health *= GameConfig.DIFFICULTY_MODIFIERS[GameSaveData.Instance.difficulty].playerHealthMultiplier;
@@ -27,7 +29,8 @@ public class Player : PlayerEntity
inputController = new PlayerInputController(this);
movementController = new PlayerMovementController(this);
animationController = new PlayerAnimationController(this);
- audioController = new PlayerAudioController(this);
+ audioController = new PlayerAudioController(this, audioController.audios);
+
SetLayer(EnvironmentConfig.LAYER_PLAYER);
SetAttackLayer(EnvironmentConfig.LAYER_PLAYER_ATTACK);
GameController.Instance.player = this;
@@ -64,7 +67,7 @@ public class Player : PlayerEntity
protected new void Update()
{
base.Update();
- if(Dead)
+ if(Dead || GameController.Instance.IsPaused)
{
return;
}
@@ -75,7 +78,7 @@ public class Player : PlayerEntity
protected new void FixedUpdate()
{
base.FixedUpdate();
- if(Dead)
+ if(Dead || GameController.Instance.IsPaused)
{
return;
}
@@ -110,7 +113,6 @@ public class Player : PlayerEntity
stateController.currentInteractables.Remove(interactable);
}
-
protected void OnDrawGizmosSelected()
{
// Visualize stair detection
diff --git a/Assets/_Scripts/Core/Player/PlayerAnimationController.cs b/Assets/_Scripts/Core/Player/PlayerAnimationController.cs
index f5ec3e421b52e18b205a9ffe1ccd5641da010776..5ba0a3c4c203076ea5226436043830a001aa5ecd 100644
--- a/Assets/_Scripts/Core/Player/PlayerAnimationController.cs
+++ b/Assets/_Scripts/Core/Player/PlayerAnimationController.cs
@@ -27,7 +27,7 @@ public class PlayerAnimationController : AnimationController
}
// Functions
- public void AnimateStates(int oldState)
+ public void AnimateStates(int oldState, int newState)
{
#if STRICT
if(animator == null)
@@ -36,12 +36,12 @@ public class PlayerAnimationController : AnimationController
}
#endif
- if((player.stateController.State & PlayerState.JUMPING) > 0)
+ if((newState & PlayerState.JUMPING) > 0)
{
animator.SetBool(JUMP_BOOL, true);
}
- switch (GetMovementState(player.stateController.State))
+ switch (GetMovementState(newState))
{
case PlayerState.IDLE:
animator.SetInteger(MOVEMENT_PARAM, PlayerState.IDLE);
diff --git a/Assets/_Scripts/Core/Player/PlayerAudioController.cs b/Assets/_Scripts/Core/Player/PlayerAudioController.cs
index 409532d2b9806e33c896989f36c0c31df4a6190a..c0b678e039e921bd3ee7f79b2b22a03c9dcbbcd5 100644
--- a/Assets/_Scripts/Core/Player/PlayerAudioController.cs
+++ b/Assets/_Scripts/Core/Player/PlayerAudioController.cs
@@ -1,10 +1,116 @@
using System;
+using System.Collections.Generic;
+using UnityEngine;
[Serializable]
public class PlayerAudioController : AudioController
{
- // Constructor
- public PlayerAudioController(Player player) : base(player.gameObject)
+ // Static Attributes
+ public const string ATTACK_KEY = "attack_";
+ public const string DEATH_KEY = "dead_";
+ public const string HIT_KEY = "hit_";
+ public const string JUMP_KEY = "jump_";
+ public const string SKILL_KEY = "skill_";
+ public const string SPRINT_KEY = "sprint_";
+ public const string RUNNING_KEY = "running_";
+ public const string WALKING_KEY = "walking_";
+
+ // Attributes
+ private readonly Player player;
+ private readonly string[] keys = new string[]{
+ ATTACK_KEY,
+ DEATH_KEY,
+ HIT_KEY,
+ JUMP_KEY,
+ SKILL_KEY,
+ SPRINT_KEY,
+ RUNNING_KEY,
+ WALKING_KEY
+ };
+ private readonly Dictionary<string, int> audioAmount = new();
+
+ // Constructors
+ public PlayerAudioController(Player player, Audio[] audios) : base(player.gameObject, audios)
+ {
+ foreach (Audio audio in audios)
+ {
+ foreach(string key in keys)
+ {
+ if(!audioAmount.ContainsKey(key))
+ {
+ audioAmount.Add(key, 0);
+ }
+
+ if(audio.name.StartsWith(key))
+ {
+ audioAmount[key]++;
+ }
+ }
+ }
+
+ this.player = player;
+ player.OnDamagedEvent += OnDamaged;
+ player.OnDeathEvent += OnDeath;
+ player.inputController.OnJumpEvent += OnJump;
+ player.stateController.OnStateChangeEvent += OnStateChange;
+ }
+
+ public new string Play(string key)
{
+ int index = UnityEngine.Random.Range(1, audioAmount[key] + 1);
+ string audioName = key + index;
+ base.Play(audioName);
+
+ return audioName;
+ }
+
+ public new void Stop(string key)
+ {
+ for (int i = 1; i < audioAmount[key] + 1; i++)
+ {
+ string audioName = key + i;
+ base.Stop(audioName);
+ }
+ }
+
+ public void OnDamaged()
+ {
+ Play(HIT_KEY);
+ }
+
+ public void OnDeath()
+ {
+ Play(DEATH_KEY);
+ }
+
+ public void OnJump()
+ {
+ Play(JUMP_KEY);
+ }
+
+ public void OnStateChange(int oldState, int newState)
+ {
+ if((newState & PlayerState.SPRINTING) == 0
+ && (oldState & PlayerState.SPRINTING) != 0)
+ {
+ Stop(RUNNING_KEY);
+ }
+ else if((newState & PlayerState.SPRINTING) > 0
+ && (oldState & PlayerState.SPRINTING) == 0)
+ {
+ Play(SPRINT_KEY);
+ Play(RUNNING_KEY);
+ }
+
+ if((newState & PlayerState.WALKING) == 0
+ && (oldState & PlayerState.WALKING) != 0)
+ {
+ Stop(WALKING_KEY);
+ }
+ else if((newState & PlayerState.WALKING) > 0
+ && (oldState & PlayerState.WALKING) == 0)
+ {
+ Play(WALKING_KEY);
+ };
}
}
\ No newline at end of file
diff --git a/Assets/_Scripts/Core/Player/PlayerInputController.cs b/Assets/_Scripts/Core/Player/PlayerInputController.cs
index 9c34e354d409786c8ce34ca0e856c40620b63caa..12a12f493984a5c272f5c930582e02202c0688a7 100644
--- a/Assets/_Scripts/Core/Player/PlayerInputController.cs
+++ b/Assets/_Scripts/Core/Player/PlayerInputController.cs
@@ -11,10 +11,10 @@ public class PlayerInputController
public float movementInputZ;
public float movementInputScroll;
public bool movementInputJump;
+ protected float attackWindowSize = 0.5f;
protected Coroutine attackWindowCoroutine;
// Events
- public event Action<float, float> OnMovementEvent;
public event Action OnJumpEvent;
public event Action<bool> OnAimEvent;
private bool aim = false;
@@ -32,11 +32,6 @@ public class PlayerInputController
movementInputZ = Input.GetAxisRaw("Vertical");
movementInputScroll = Input.GetAxisRaw("Mouse ScrollWheel");
- if(movementInputX != 0 || movementInputZ != 0)
- {
- OnMovementEvent?.Invoke(movementInputX, movementInputZ);
- }
-
if(Input.GetButtonDown("Jump") && player.Grounded)
{
OnJumpEvent?.Invoke();
@@ -73,10 +68,7 @@ public class PlayerInputController
{
Debug.Log("Player does not have a weapon");
return;
- }
-
- player.stateController.SetWeaponState(WeaponState.ATTACK);
-
+ }
player.StartCoroutine(HandleAttack());
}
else if(Input.GetKeyDown(GameInput.Instance.attackAlternateButton) && player.Grounded)
@@ -87,9 +79,6 @@ public class PlayerInputController
Debug.Log("Player does not have a weapon");
return;
}
-
- player.stateController.SetWeaponState(WeaponState.ALTERNATE_ATTACK);
-
player.StartCoroutine(HandleAlternateAttack());
}
else if(Input.GetKeyDown(GameInput.Instance.attackSkillButton) && player.Grounded)
@@ -110,8 +99,6 @@ public class PlayerInputController
}
Debug.Log("Player is Using a skill");
- player.stateController.SetWeaponState(WeaponState.SKILL);
-
player.StartCoroutine(HandleSkill());
}
else if(Input.GetKeyDown(GameInput.Instance.interactButton) && player.Grounded)
@@ -122,7 +109,7 @@ public class PlayerInputController
return;
}
- IInteractable interactable = player.stateController.currentInteractables[player.stateController.currentInteractables.Count - 1];
+ IInteractable interactable = player.stateController.currentInteractables[^1];
interactable.Interact();
}
}
@@ -156,13 +143,18 @@ public class PlayerInputController
_ => 0
};
- if(attackWindowCoroutine != null)
+
+ player.animationController.AnimateAttack(player.Weapon.attackType);
+ if(player.Weapon.CanAttack)
{
- player.StopCoroutine(attackWindowCoroutine);
+ if(player.Weapon.attackType == AttackType.MELEE
+ || player.stateController.weaponState != WeaponState.ATTACK)
+ {
+ player.audioController.Play(PlayerAudioController.ATTACK_KEY);
+ }
}
- attackWindowCoroutine = player.StartCoroutine(HandleAttackWindow(player.Weapon.data.attackInterval));
-
- player.animationController.AnimateAttack(player.Weapon.attackType);
+
+ TriggerWeaponState(WeaponState.ATTACK);
yield return new WaitForSeconds(delay);
player.Weapon.Attack();
}
@@ -176,26 +168,29 @@ public class PlayerInputController
_ => 0
};
- if(attackWindowCoroutine != null)
+
+ player.animationController.AnimateAttack(player.Weapon.alternateAttackType);
+ if(player.Weapon.CanAttack)
{
- player.StopCoroutine(attackWindowCoroutine);
+ if(player.Weapon.alternateAttackType == AttackType.MELEE
+ || player.stateController.weaponState != WeaponState.ALTERNATE_ATTACK)
+ {
+ player.audioController.Play(PlayerAudioController.ATTACK_KEY);
+ }
}
- attackWindowCoroutine = player.StartCoroutine(HandleAttackWindow(player.Weapon.data.alternateAttackInterval));
- player.animationController.AnimateAttack(player.Weapon.alternateAttackType);
+ TriggerWeaponState(WeaponState.ALTERNATE_ATTACK);
yield return new WaitForSeconds(delay);
player.Weapon.AlternateAttack();
}
private IEnumerator HandleSkill()
{
- if(attackWindowCoroutine != null)
- {
- player.StopCoroutine(attackWindowCoroutine);
- }
- attackWindowCoroutine = player.StartCoroutine(HandleAttackWindow(player.Weapon.data.skillInterval));
+ player.audioController.Play(PlayerAudioController.SKILL_KEY);
player.animationController.AnimateSkill();
+
+ TriggerWeaponState(WeaponState.SKILL);
yield return new WaitForSeconds(player.model.skillAnimationDelay);
player.Weapon.Skill();
}
@@ -206,4 +201,14 @@ public class PlayerInputController
yield return new WaitForSeconds(attackWindow);
player.stateController.ClearWeaponState();
}
+
+ private void TriggerWeaponState(WeaponState state)
+ {
+ player.stateController.SetWeaponState(state);
+ if(attackWindowCoroutine != null)
+ {
+ player.StopCoroutine(attackWindowCoroutine);
+ }
+ attackWindowCoroutine = player.StartCoroutine(HandleAttackWindow(player.Weapon.data.skillInterval + attackWindowSize));
+ }
}
\ No newline at end of file
diff --git a/Assets/_Scripts/Core/Player/PlayerStateController.cs b/Assets/_Scripts/Core/Player/PlayerStateController.cs
index 86143074b3ca71aac702b1002d57bdc3dfd4e4f6..1ed1659495bdc882aad440abe7bb0b206768a16d 100644
--- a/Assets/_Scripts/Core/Player/PlayerStateController.cs
+++ b/Assets/_Scripts/Core/Player/PlayerStateController.cs
@@ -59,12 +59,20 @@ public class PlayerStateController : EntityStateController
_ => PlayerState.NULL
};
- state |= extraState;
+ if((state & PlayerState.SPRINTING) > 0)
+ {
+ state |= extraState;
+ }
+ else
+ {
+ state = PlayerState.IDLE | extraState;
+ }
+
}
if(initialState != state)
{
- InvokeOnStateChanged(initialState);
+ InvokeOnStateChanged(initialState, state);
}
return state;
diff --git a/Assets/_Scripts/Library/BaseClasses/Audio.cs b/Assets/_Scripts/Library/BaseClasses/Audio.cs
index b30fc9ecd1fb70896ff9a78f3f478457d45f3757..1e9e4d5c139dc3a69a278773ee397cdf9fe7c128 100644
--- a/Assets/_Scripts/Library/BaseClasses/Audio.cs
+++ b/Assets/_Scripts/Library/BaseClasses/Audio.cs
@@ -10,4 +10,6 @@ public class Audio
public AudioClip clip;
public float volume;
public float pitch;
+ public bool loop;
+ public bool spatialize;
}
\ No newline at end of file
diff --git a/Assets/_Scripts/Library/BaseClasses/Controller/AudioController.cs b/Assets/_Scripts/Library/BaseClasses/Controller/AudioController.cs
index 828611b89624a5ad43f818cbab55932d399e0af1..38860b7b3d89513372b5797c7ecb922224c56dba 100644
--- a/Assets/_Scripts/Library/BaseClasses/Controller/AudioController.cs
+++ b/Assets/_Scripts/Library/BaseClasses/Controller/AudioController.cs
@@ -8,13 +8,10 @@ public class AudioController
public Audio[] audios;
// Constructors
- public AudioController(GameObject gameObject)
+ public AudioController(GameObject gameObject, Audio[] audios)
{
- if(audios == null)
- {
- audios = new Audio[0];
- }
-
+ this.audios = audios;
+
foreach (Audio audio in audios)
{
audio.source = gameObject.AddComponent<AudioSource>();
@@ -22,20 +19,38 @@ public class AudioController
audio.source.volume = audio.volume;
audio.source.pitch = audio.pitch;
+ audio.source.playOnAwake = false;
+ audio.source.loop = audio.loop;
+ audio.source.spatialize = audio.spatialize;
}
}
// Functions
- public void Play (string name)
+ public string Play (string name)
{
Audio audio = Array.Find(audios, audio => audio.name == name);
if(audio == null)
{
Debug.LogWarning($"Audio not found: {name}");
- return;
+ return null;
}
audio.source.Play();
+
+ return name;
+ }
+
+ public void Stop (string name)
+ {
+ Audio audio = Array.Find(audios, audio => audio.name == name);
+
+ if(audio == null)
+ {
+ Debug.LogWarning($"Audio not found: {name}");
+ return;
+ }
+
+ audio.source.Stop();
}
}
\ No newline at end of file
diff --git a/Assets/_Scripts/Library/BaseClasses/Controller/EntityStateController.cs b/Assets/_Scripts/Library/BaseClasses/Controller/EntityStateController.cs
index 796b503059faf27c1109a15e827f37352f1e6606..5af524d6b90231c708055d223d90c5b58bb0582b 100644
--- a/Assets/_Scripts/Library/BaseClasses/Controller/EntityStateController.cs
+++ b/Assets/_Scripts/Library/BaseClasses/Controller/EntityStateController.cs
@@ -9,12 +9,12 @@ public abstract class EntityStateController
public int State => state;
// Events
- public event Action<int> OnStateChangeEvent;
+ public event Action<int, int> OnStateChangeEvent;
// Functions
- protected void InvokeOnStateChanged(int oldState)
+ protected void InvokeOnStateChanged(int oldState, int newState)
{
- OnStateChangeEvent?.Invoke(oldState);
+ OnStateChangeEvent?.Invoke(oldState, newState);
}
// Abstract Functions