From ce746fc1aa4132a4f6c540478e448ff346099961 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 26 Feb 2022 16:16:42 +0300 Subject: [PATCH 1/6] Jump Animations Added --- Assets/Animations/Player/JumpAir.anim | 53 ++++++ Assets/Animations/Player/JumpAir.anim.meta | 8 + Assets/Animations/Player/JumpGround.anim | 53 ++++++ Assets/Animations/Player/JumpGround.anim.meta | 8 + Assets/Sprites/Player/Player.aseprite | Bin 3196 -> 3944 bytes Assets/Sprites/Player/Player.png | Bin 1150 -> 1561 bytes Assets/Sprites/Player/Player.png.meta | 170 ++++++++++++++---- 7 files changed, 262 insertions(+), 30 deletions(-) create mode 100644 Assets/Animations/Player/JumpAir.anim create mode 100644 Assets/Animations/Player/JumpAir.anim.meta create mode 100644 Assets/Animations/Player/JumpGround.anim create mode 100644 Assets/Animations/Player/JumpGround.anim.meta diff --git a/Assets/Animations/Player/JumpAir.anim b/Assets/Animations/Player/JumpAir.anim new file mode 100644 index 0000000..24a5abf --- /dev/null +++ b/Assets/Animations/Player/JumpAir.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpAir + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/JumpAir.anim.meta b/Assets/Animations/Player/JumpAir.anim.meta new file mode 100644 index 0000000..7e83e45 --- /dev/null +++ b/Assets/Animations/Player/JumpAir.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f30e36d57252aa742ac4dfa3795d2514 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Player/JumpGround.anim b/Assets/Animations/Player/JumpGround.anim new file mode 100644 index 0000000..fd9d652 --- /dev/null +++ b/Assets/Animations/Player/JumpGround.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpGround + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/JumpGround.anim.meta b/Assets/Animations/Player/JumpGround.anim.meta new file mode 100644 index 0000000..380a5f4 --- /dev/null +++ b/Assets/Animations/Player/JumpGround.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8a1902a8ce16cab4b9308fe4c5dd948c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Player/Player.aseprite b/Assets/Sprites/Player/Player.aseprite index 5297bb9b9697a8504bbf7945edd81bff064b80be..5d4968c36355fac200ac6ffc03af8ca5c5be8b86 100644 GIT binary patch delta 1073 zcmew(@j{M0gP(!n!BXLg?3GN4ObeSB>q{9J7$g)}fFukcvw>nP44x@DsjLjVFnI{g z&Ja|ZmzSBB&d0!qD#OX(RhnDiR+N~V%FiH#D#yy;ndg{UvXrZHWt46E7Zq5IFrX!}ZTq)|=!+%y<|W?g#u5 zSPOIyvU}$O`4IOqA-R_a7=9r49$+zh{Y$bdW$Sv}p*I-$m_~^!$18kEuM0MOSaI6%Mde=E`4@Q@wjE>= zSqF3xauCl0@GP&WzVvYkXynBcJPlc3a?$aaeK;k$pgdwR{PnU zHTC}-%Z2T>CtU1a=>G1X)t;&iH=Eb6&#o)6RWS3Ag*mvVLdEuz{&quwAbu|H{#`OH z^RD0iD0!BFA^YQRMO-O@DCZU+!WimaHMU9YE18WRnw-(gsk(5tIZu3&m56;(aK9^m zS9Rf!r}mSo3wE(~$MM(}eZT(jYV%pS6x$nL9$#wixp-A5i2tyKvK&W3)|2?WWQ8Si XB4To-mK?V0w?8(X#mM0Qlpz`bhBR~6 delta 106 zcmaDM_eX-ghKGUS!BYN-?3GL}85cG&Iyo{hFi0pc0ZABOg)tyB3xj7$PAVG%AF41r gLr`g6US?kUvdN5G+LN!dR&8F$w1Ii^Y}RBp0N%6{yZ`_I diff --git a/Assets/Sprites/Player/Player.png b/Assets/Sprites/Player/Player.png index 47690e6ce7fbb2aea66375f0a0060d7f36b5d6af..1368b50634306fe51576e32f9769132d7ffe695f 100644 GIT binary patch delta 1557 zcmV+w2I~3#2$>9!7k@wq1^@s6^?3f500001b5ch_0Itp)=>Px)(@8`@RCt{2olj^S zRUF5EFA-}61$rtht*exto12Ff4dl||C0>M* zJxGW*-PTjk)XQ!{3a(^X2*miOh#OnN^U%!8o7wmO&F-+y?|%a!VRpXrd+#@I-n^an z%^Ls&K@bE%kn}-hA7tBA7+v3lscUzrX#aAvraW-k^=V;1w6T=Q0RTX2E>9~v%lt?5 z_(w?``qA~xMC1GD)5J5f4~|bD008hwyfksu=)kWpt-*G&;H;mzc86BxmJ^HbTmQ7c zdZ1D!$9@2wCVwzUR%7^l=r;(i!l-_7X^r~m0U*)%w)Iad?4Hh_I1ZMm=v7#5)^ysW z^`Vp8&G>01ItHQuK=-G{q4EAS+ZY)Ks4&uR6$`TD#}faK+!(ZG^DIW(o-1S+imr&**y9B_KK7K!L4~Rw158>#2G)$2)~8hy|*abnMH-0MNA0(3c!VEyr7zR%Amu**d#~}a! zGQ9x=0N~N9FP&_0&^Io=<)!zCk01zwAP9n_h+g`ELa}Zf~-q6)=My|e`_ueuYY~>qjP*+{&o1~|GU+jWQ)_s=?4mRnKAom z2!9NdTRX-SLr4BXXx_p;b&6ih3Wr%V=UAFjr>5S{POObOf&fMi_$_! zpwVOK_O;X-#pinvdibwZ4*1w)_!O@-X|zP=rnJ!u@^6Hq48rZ9TUbbJ?}s6WXMauu z01)!rFfWe&ttucnJaZbz(6i)d?*NYW4x%SfRVbzp_B+};0Q&feDrQI@NuIT#jf+iS za6ohn=`qXA8q^mqFufp$%6jm6N&a=mAOJuDPn2cu5ClOG1VIo4F-17SE@g61Zq{&- zB}9vKHa-9sSwd8>$yCu2C%DKGqJKl#1K}b|hz_YA2*BACg`^1KT-e!-hcw%+(#p;< z+lGw>5g|0y-@Ug8gU5eI8xD?t5FTqkkjMVW|B#Ml>UcYY%o5NTK97wD0RRg>5H=b_ zgsC5hWZPBYzt|!Of*?pTC~rs8tDkvIr1rZW(W9Ko@SRBQcRivKJjxN6gXsfm|n2gLi2pwYo;|?hl*@?k-9{P=HC& zWq@vbecUh|$V-}s0nvZ)NpJ$YtSc9w&a zqFvucr8js%oK&A}SE-L)5q}?Xz-oDy0Npc`e%B-BXa~`%RVqyAcRive^s*J;ZUdsk z+sw$j>dVa<83Uk6#YgPu7z2sA|D(MFW%BvgW%}sL%^DeNtaglDx*Z>Jrz5Gs2_z#! zg#L3#0RVQhmyMI(?|Q_J&~u>r!VJ`d4Fkj~@%^qx-1rZ)k#+xqUk=o200000NkvXX Hu0mjf8~_zY delta 1142 zcmV-+1d02Z4E_j^7k?lK1^@s6{fzO=00001b5ch_0Itp)=>Px(I7vi7RCt{2n@>m- zQ5?s=Pb2@3L}XEjl7W&K1WRol1ksbSBp5_tC&81jXcpmFZykgZyeM7l5=0(C>{ezc zDebZ<1{uo2g4rJlv_z(ZJFhphGjHC!H@nl+`@-Tf^FHtQet+MY_ulO8Pe4mcOG`^j zOY8p=aXV4FGmEO31;qO%45#)Z8!2wbnpfkaq9Uh*1J#WHfOLDzm|7iUPZ`-4S3&Sq zGYg@{50j6Q4!NDkUO)f@0Mh zv8LGl+hGO^^UKKunYnkL9{05RG6A0a#ZL37)*W+o8g%##iw#vSPnTBum{bfN4aL zulxxBsPfxqPX0L}!LM~(QsNcj18V+hX=!O`X=!O`MM#CL2eQN}1P>hiD&H_Vozq7l z`2QjQyww9a)bki9Aa61&$pqWJpnRD5SIsOakAGi;&s#l^YCTWb^*~|Q6Gg?pywwA- z!J=3X6m~t4YW}LcX#S2{7yy_*7lg@T^pMnenUgH2;wN3(|j~ z@dsHCWZ5gzZ85*RYJAG8)&oiM!uiiX=yCe+qUv8@{`<+FeFmZfI5Gdhc=Px+-Vb+K z8h`t#=beAple0{+^)wiF|3zIgKIM<4){R$FgE1LB* zKHWR-1exdDT!2Lb?myn2x` z#ix$D4#Gu-y$`RpK6#<|>5LvRhdJQhJ!|XST4P*|J|m-k>ONw%gBa!T7bui)rC)=J_sY zV`38&7diFe+ULkd3QOIsly~run+MCg`0v#R0YJ=}C{gcz11}pZHKkWr(f|Me07*qo IM6N<$g61PRAOHXW diff --git a/Assets/Sprites/Player/Player.png.meta b/Assets/Sprites/Player/Player.png.meta index da4b8b9..9111773 100644 --- a/Assets/Sprites/Player/Player.png.meta +++ b/Assets/Sprites/Player/Player.png.meta @@ -108,11 +108,11 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 16 + y: 48 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -129,11 +129,11 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 16 + y: 48 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -150,11 +150,11 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 16 + y: 48 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -171,11 +171,11 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 16 + y: 48 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -192,11 +192,11 @@ TextureImporter: rect: serializedVersion: 2 x: 64 - y: 16 + y: 48 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -213,11 +213,11 @@ TextureImporter: rect: serializedVersion: 2 x: 80 - y: 16 + y: 48 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -234,11 +234,11 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -255,11 +255,11 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -276,11 +276,11 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -297,11 +297,11 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -318,11 +318,11 @@ TextureImporter: rect: serializedVersion: 2 x: 64 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -339,11 +339,11 @@ TextureImporter: rect: serializedVersion: 2 x: 80 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -360,11 +360,11 @@ TextureImporter: rect: serializedVersion: 2 x: 96 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -381,11 +381,11 @@ TextureImporter: rect: serializedVersion: 2 x: 112 - y: 0 + y: 32 width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -402,6 +402,48 @@ TextureImporter: rect: serializedVersion: 2 x: 128 + y: 32 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: b1abf7acd2be14f42b2d4d1ac91148c1 + internalID: -2011013116 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_15 + rect: + serializedVersion: 2 + x: 0 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 08bb5a4d3b2397a479764c8e6f4df88e + internalID: 180603488 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_16 + rect: + serializedVersion: 2 + x: 0 y: 0 width: 16 height: 16 @@ -412,8 +454,71 @@ TextureImporter: physicsShape: [] tessellationDetail: 0 bones: [] - spriteID: b1abf7acd2be14f42b2d4d1ac91148c1 - internalID: -2011013116 + spriteID: 87f4848cf958b654891ba0dab593e5cb + internalID: 1293344572 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_17 + rect: + serializedVersion: 2 + x: 16 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: cb705532072ec3748a708c551fb62e00 + internalID: 118679525 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_18 + rect: + serializedVersion: 2 + x: 32 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 9ea441819b536fe4ebccc4f4bd599091 + internalID: 1291750529 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_19 + rect: + serializedVersion: 2 + x: 48 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 01940affa11bc0a4db69c7e6e3b3c71e + internalID: 2143467853 vertices: [] indices: edges: [] @@ -430,8 +535,11 @@ TextureImporter: secondaryTextures: [] nameFileIdTable: Player_11: -375057873 + Player_17: 118679525 + Player_19: 2143467853 Player_2: -1841721584 Player_4: 825225972 + Player_18: 1291750529 Player_12: -284386636 Player_6: -1414671332 Player_1: -1592093818 @@ -439,9 +547,11 @@ TextureImporter: Player_14: -2011013116 Player_0: 1298688296 Player_7: 1107039308 + Player_16: 1293344572 Player_3: -526475696 Player_8: 1791482633 Player_10: 1146259828 + Player_15: 180603488 Player_13: 1394398855 Player_5: 1441602087 spritePackingTag: From 2ba5ec8d32f773a402e0d416a55459d12dd22f18 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 26 Feb 2022 16:48:44 +0300 Subject: [PATCH 2/6] Player On Wall Animation Added --- Assets/Animations/Player/OnWall.anim | 53 ++++++ Assets/Animations/Player/OnWall.anim.meta | 8 + Assets/Scripts/Player/PlayerController.cs | 3 + Assets/Sprites/Player/Player.aseprite | Bin 3944 -> 4782 bytes Assets/Sprites/Player/Player.png | Bin 1561 -> 1852 bytes Assets/Sprites/Player/Player.png.meta | 222 ++++++++++++++++++---- 6 files changed, 252 insertions(+), 34 deletions(-) create mode 100644 Assets/Animations/Player/OnWall.anim create mode 100644 Assets/Animations/Player/OnWall.anim.meta diff --git a/Assets/Animations/Player/OnWall.anim b/Assets/Animations/Player/OnWall.anim new file mode 100644 index 0000000..143f087 --- /dev/null +++ b/Assets/Animations/Player/OnWall.anim @@ -0,0 +1,53 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OnWall + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Player/OnWall.anim.meta b/Assets/Animations/Player/OnWall.anim.meta new file mode 100644 index 0000000..b0afc00 --- /dev/null +++ b/Assets/Animations/Player/OnWall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b40c9e52b72cda847a456f33b2c9cccf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 9219771..0a6575b 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -47,6 +47,7 @@ namespace Player private const string IsMovingParameter = "IsMoving"; private const string IsGroundedParameter = "IsGrounded"; + private const string IsWalledParameter = "IsWalled"; private Animator animator = null; private void Awake() @@ -115,7 +116,9 @@ namespace Player _playerRigidbody2D.velocity = new Vector2(0.0f, _playerRigidbody2D.velocity.y); animator.SetBool(IsMovingParameter, false); } + animator.SetBool(IsGroundedParameter, _playerGroundTrigger.IsCollided); + animator.SetBool(IsWalledParameter, _playerWallTriggerLeft.IsCollided || _playerWallTriggerRight.IsCollided); if (_jumpKeyPressed && _playerGroundTrigger.IsCollided && _canJump) Jump(); diff --git a/Assets/Sprites/Player/Player.aseprite b/Assets/Sprites/Player/Player.aseprite index 5d4968c36355fac200ac6ffc03af8ca5c5be8b86..03a796d45ac204621f31525484cd2b010153ded7 100644 GIT binary patch delta 1013 zcmaDMw@#IPoe%@VgQZdv*(;g8F)nOkte?ohz#yT(3M65G4aR`bYz+Q+;fXmp>WzK{L;J>9tIIqNp^;y(!9LPymV0pNd|^`WJwkV&y<|h zWS|hM0s{jZ0~5o4CYU@210O@hoa6+D2BpZi|4+~8 zRTHl&olZ7pj{mV>x4ip|hrRL)51$>iE`i$#u`&h7XH@{&kKLbeJ7NChNA>4y>4{ej z6c}@!DV$D*_|&fa5x4w|-y3$$o?*ez$;{As=Gd1~G)q&#mLk~+34d7NqFd_ABe{4c zyIAwZA77MqH%_qGg<`3X{3aVK>G}2(o^JffIQw=-FY^QohAXp=eZlTkBwK;5U|;}S zT91fQiRl&`+Mv+Aab$wwtjYvKiC%yGP0}1E7w;B~v>@nqx7#`Ae4 z-yd@ruX)HnnVEq#?Wi>(ArX^~u%ulh{E0Vu!^`8(*>gVKc*JnG-@uYVfA>-A&1-pf nGfn=-y?*m-)?_xpUBIA(q-BT`R!wH)(w=;sHEnYzlMpiiL2N`E delta 188 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 Hu0mjfuJ9EK diff --git a/Assets/Sprites/Player/Player.png.meta b/Assets/Sprites/Player/Player.png.meta index 9111773..0a8dc6d 100644 --- a/Assets/Sprites/Player/Player.png.meta +++ b/Assets/Sprites/Player/Player.png.meta @@ -108,11 +108,11 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 48 + y: 0 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -129,11 +129,11 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 48 + y: 0 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -150,11 +150,11 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 48 + y: 0 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -171,11 +171,11 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 48 + y: 0 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -192,11 +192,11 @@ TextureImporter: rect: serializedVersion: 2 x: 64 - y: 48 + y: 0 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -213,7 +213,7 @@ TextureImporter: rect: serializedVersion: 2 x: 80 - y: 48 + y: 0 width: 16 height: 16 alignment: 0 @@ -234,11 +234,11 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -255,11 +255,11 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -276,11 +276,11 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -297,11 +297,11 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -318,11 +318,11 @@ TextureImporter: rect: serializedVersion: 2 x: 64 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -339,11 +339,11 @@ TextureImporter: rect: serializedVersion: 2 x: 80 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -360,11 +360,11 @@ TextureImporter: rect: serializedVersion: 2 x: 96 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -381,11 +381,11 @@ TextureImporter: rect: serializedVersion: 2 x: 112 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -402,11 +402,11 @@ TextureImporter: rect: serializedVersion: 2 x: 128 - y: 32 + y: 16 width: 16 height: 16 alignment: 0 - pivot: {x: 0.5, y: 0.5} + pivot: {x: 0, y: 0} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -423,7 +423,7 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 16 + y: 32 width: 16 height: 16 alignment: 0 @@ -444,7 +444,7 @@ TextureImporter: rect: serializedVersion: 2 x: 0 - y: 0 + y: 48 width: 16 height: 16 alignment: 0 @@ -465,7 +465,7 @@ TextureImporter: rect: serializedVersion: 2 x: 16 - y: 0 + y: 48 width: 16 height: 16 alignment: 0 @@ -486,7 +486,7 @@ TextureImporter: rect: serializedVersion: 2 x: 32 - y: 0 + y: 48 width: 16 height: 16 alignment: 0 @@ -507,7 +507,7 @@ TextureImporter: rect: serializedVersion: 2 x: 48 - y: 0 + y: 48 width: 16 height: 16 alignment: 0 @@ -523,6 +523,153 @@ TextureImporter: indices: edges: [] weights: [] + - serializedVersion: 2 + name: Player_20 + rect: + serializedVersion: 2 + x: 0 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 6fc6db0a69805bd4382de4148302b4c4 + internalID: -2109353353 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_21 + rect: + serializedVersion: 2 + x: 16 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ea65d534f2c7e5b45aa9a4ea1214efce + internalID: -932523871 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_22 + rect: + serializedVersion: 2 + x: 32 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 38dd844f938b031488a7758f51dcf6d8 + internalID: 2059507875 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_23 + rect: + serializedVersion: 2 + x: 48 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 38f17b4ed4142bf419a2e5d39b570278 + internalID: -724040594 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_24 + rect: + serializedVersion: 2 + x: 64 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 979eac1ed505b2d4f8d571c7d8d5f531 + internalID: -1692090074 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_25 + rect: + serializedVersion: 2 + x: 80 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 201d191d173fab6409235fe91c8fcf8a + internalID: -2100026830 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: Player_26 + rect: + serializedVersion: 2 + x: 96 + y: 64 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 006877ce92e6edb4483587bdad0e91d9 + internalID: 231691911 + vertices: [] + indices: + edges: [] + weights: [] outline: [] physicsShape: [] bones: [] @@ -536,10 +683,14 @@ TextureImporter: nameFileIdTable: Player_11: -375057873 Player_17: 118679525 + Player_20: -2109353353 Player_19: 2143467853 Player_2: -1841721584 Player_4: 825225972 Player_18: 1291750529 + Player_23: -724040594 + Player_22: 2059507875 + Player_25: -2100026830 Player_12: -284386636 Player_6: -1414671332 Player_1: -1592093818 @@ -551,8 +702,11 @@ TextureImporter: Player_3: -526475696 Player_8: 1791482633 Player_10: 1146259828 + Player_26: 231691911 Player_15: 180603488 Player_13: 1394398855 + Player_21: -932523871 + Player_24: -1692090074 Player_5: 1441602087 spritePackingTag: pSDRemoveMatte: 0 From e80158e77f66287078c661df534ce12f95dddf5d Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 26 Feb 2022 17:39:34 +0300 Subject: [PATCH 3/6] Jump Audio Added + Anmiation Fix --- Assets/Animations/Player/Idle.anim | 37 +- Assets/Animations/Player/JumpAir.anim | 34 +- Assets/Animations/Player/JumpGround.anim | 25 +- Assets/Animations/Player/OnWall.anim | 43 +- Assets/Animations/Player/Player_0.controller | 490 +++++++++++++++++- Assets/Animations/Player/Running.anim | 49 +- Assets/Audio.meta | 8 + Assets/Audio/Audio Mixer.mixer | 173 +++++++ Assets/Audio/Audio Mixer.mixer.meta | 8 + Assets/Audio/Sound Effects.meta | 8 + Assets/Audio/Sound Effects/Jump.bfxrsound | 1 + .../Audio/Sound Effects/Jump.bfxrsound.meta | 7 + Assets/Audio/Sound Effects/Jump.wav | Bin 0 -> 15966 bytes Assets/Audio/Sound Effects/Jump.wav.meta | 22 + Assets/Resources/Playable/Player.prefab | 98 ++++ Assets/Scripts/Player/PlayerController.cs | 3 + 16 files changed, 979 insertions(+), 27 deletions(-) create mode 100644 Assets/Audio.meta create mode 100644 Assets/Audio/Audio Mixer.mixer create mode 100644 Assets/Audio/Audio Mixer.mixer.meta create mode 100644 Assets/Audio/Sound Effects.meta create mode 100644 Assets/Audio/Sound Effects/Jump.bfxrsound create mode 100644 Assets/Audio/Sound Effects/Jump.bfxrsound.meta create mode 100644 Assets/Audio/Sound Effects/Jump.wav create mode 100644 Assets/Audio/Sound Effects/Jump.wav.meta diff --git a/Assets/Animations/Player/Idle.anim b/Assets/Animations/Player/Idle.anim index a5394fa..23320ab 100644 --- a/Assets/Animations/Player/Idle.anim +++ b/Assets/Animations/Player/Idle.anim @@ -17,21 +17,48 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1298688296, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: -1592093818, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: -1841721584, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: -526475696, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.33333334 + value: {fileID: 825225972, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1298688296, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -1592093818, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -1841721584, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -526475696, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 825225972, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.4166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/JumpAir.anim b/Assets/Animations/Player/JumpAir.anim index 24a5abf..b7d4ac4 100644 --- a/Assets/Animations/Player/JumpAir.anim +++ b/Assets/Animations/Player/JumpAir.anim @@ -17,21 +17,45 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 1293344572, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: 118679525, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: 1291750529, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: 2143467853, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1293344572, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 118679525, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1291750529, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 2143467853, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.33333334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/JumpGround.anim b/Assets/Animations/Player/JumpGround.anim index fd9d652..9aa09ca 100644 --- a/Assets/Animations/Player/JumpGround.anim +++ b/Assets/Animations/Player/JumpGround.anim @@ -17,21 +17,36 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 180603488, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 180603488, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.083333336 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/OnWall.anim b/Assets/Animations/Player/OnWall.anim index 143f087..e7e82fb 100644 --- a/Assets/Animations/Player/OnWall.anim +++ b/Assets/Animations/Player/OnWall.anim @@ -17,21 +17,54 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -2109353353, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: -932523871, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: 2059507875, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: -724040594, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.33333334 + value: {fileID: -1692090074, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.41666666 + value: {fileID: -2100026830, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.5 + value: {fileID: 231691911, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -2109353353, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -932523871, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 2059507875, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -724040594, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -1692090074, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -2100026830, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 231691911, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.5833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/Player/Player_0.controller b/Assets/Animations/Player/Player_0.controller index 321967d..01fbfdb 100644 --- a/Assets/Animations/Player/Player_0.controller +++ b/Assets/Animations/Player/Player_0.controller @@ -1,5 +1,198 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8613436459369443590 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Running + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1798893594530744804} + - {fileID: 8982759075538510720} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: c22f1d967a219344794e3c79ae1b58db, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-7542654066399577077 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OnWall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8640300907456473062} + - {fileID: -6298589679011570278} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: b40c9e52b72cda847a456f33b2c9cccf, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-6298589679011570278 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8841932906669489095} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1107 &-2216743789181273551 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -1525671331961030051} + m_Position: {x: 250, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8613436459369443590} + m_Position: {x: 250, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7974611625089174929} + m_Position: {x: 520, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8841932906669489095} + m_Position: {x: 520, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: -7542654066399577077} + m_Position: {x: 520, y: 190, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -1525671331961030051} +--- !u!1101 &-1798893594530744804 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1525671331961030051} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.6666666 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-1525671331961030051 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1488931661999545412} + - {fileID: 2972019993004144147} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3dcac57792de99b42af886a58c114b87, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &-437303800614401744 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsWalled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -7542654066399577077} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -8,5 +201,298 @@ AnimatorController: m_PrefabAsset: {fileID: 0} m_Name: Player_0 serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorParameters: + - m_Name: IsMoving + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsGrounded + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsWalled + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -2216743789181273551} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1300809511730035479 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7974611625089174929} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.25 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &1488931661999545412 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8613436459369443590} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.5 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2972019993004144147 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7974611625089174929} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.40000004 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6028671517645131491 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -1525671331961030051} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &7260839726499541870 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8841932906669489095} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &7974611625089174929 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpGround + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 8593646280528163568} + - {fileID: 6028671517645131491} + - {fileID: 7260839726499541870} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 8a1902a8ce16cab4b9308fe4c5dd948c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8593646280528163568 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsMoving + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -8613436459369443590} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &8640300907456473062 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsWalled + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 8841932906669489095} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.57142854 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &8841932906669489095 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: JumpAir + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1300809511730035479} + - {fileID: -437303800614401744} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f30e36d57252aa742ac4dfa3795d2514, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8982759075538510720 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7974611625089174929} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Animations/Player/Running.anim b/Assets/Animations/Player/Running.anim index 813ed4c..f0dcfdf 100644 --- a/Assets/Animations/Player/Running.anim +++ b/Assets/Animations/Player/Running.anim @@ -17,21 +17,60 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] - m_SampleRate: 60 + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1414671332, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.083333336 + value: {fileID: 1107039308, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.16666667 + value: {fileID: 1791482633, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.25 + value: {fileID: 839540401, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.33333334 + value: {fileID: 1146259828, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.41666666 + value: {fileID: -375057873, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.5 + value: {fileID: -284386636, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.5833333 + value: {fileID: 1394398855, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - time: 0.6666667 + value: {fileID: -2011013116, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 12 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: - genericBindings: [] - pptrCurveMapping: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1414671332, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1107039308, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1791482633, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 839540401, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1146259828, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -375057873, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -284386636, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: 1394398855, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} + - {fileID: -2011013116, guid: f33d6649831c9b9498b8109b6d344f43, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.75 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Audio.meta b/Assets/Audio.meta new file mode 100644 index 0000000..d8351df --- /dev/null +++ b/Assets/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ee0c3e4862980f34aa05eea70b87ae18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Audio Mixer.mixer b/Assets/Audio/Audio Mixer.mixer new file mode 100644 index 0000000..260be48 --- /dev/null +++ b/Assets/Audio/Audio Mixer.mixer @@ -0,0 +1,173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!244 &-7037003476990620901 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 7d3a5eeccceda45448eda2628e42ea7a + m_EffectName: Attenuation + m_MixLevel: c2d1bdd8f0d38af40a5f240180713495 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!244 &-6685938579179752856 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: ceb5e6875cdbb48469f261a8f82b9108 + m_EffectName: Attenuation + m_MixLevel: 03a0a2975562f604e9015f77384f0b1b + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &-2600467795151966735 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Jump + m_AudioMixer: {fileID: 24100000} + m_GroupID: 5c6c050f48fa1cf418601041c7d6c16f + m_Children: [] + m_Volume: a1af4b69dd3ea7f45ae1c3192eb02717 + m_Pitch: 94afc4d15d9d74b429d2920237994c2b + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -6685938579179752856} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!241 &24100000 +AudioMixerController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Audio Mixer + m_OutputGroup: {fileID: 0} + m_MasterGroup: {fileID: 24300002} + m_Snapshots: + - {fileID: 24500006} + m_StartSnapshot: {fileID: 24500006} + m_SuspendThreshold: -80 + m_EnableSuspend: 1 + m_UpdateMode: 0 + m_ExposedParameters: [] + m_AudioMixerGroupViews: + - guids: + - 71b61959ea8c5ee43b5f1913df7278f4 + - 5c6c050f48fa1cf418601041c7d6c16f + - aec3f58549ce7b4478c453c40c434318 + - 88391c573bd80364c916040d855538c8 + name: View + m_CurrentViewIndex: 0 + m_TargetSnapshot: {fileID: 24500006} +--- !u!243 &24300002 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Master + m_AudioMixer: {fileID: 24100000} + m_GroupID: 71b61959ea8c5ee43b5f1913df7278f4 + m_Children: + - {fileID: -2600467795151966735} + - {fileID: 8913006207396984383} + - {fileID: 8377903610078173799} + m_Volume: c8ed3e32c19202b4daadc5c4fb90bf76 + m_Pitch: d51ab31c176e6894b94b24c01f74415f + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 24400004} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!244 &24400004 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 89efd163d580f8043a2f697a1ef8009b + m_EffectName: Attenuation + m_MixLevel: 160dfd00e45f3db469fc0bec25b297ae + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!245 &24500006 +AudioMixerSnapshotController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Snapshot + m_AudioMixer: {fileID: 24100000} + m_SnapshotID: 7b03920a55d36f54bac08488dc018422 + m_FloatValues: {} + m_TransitionOverrides: {} +--- !u!244 &6357565719084711451 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 6547f870e7dafe34a8af79345a076e0f + m_EffectName: Attenuation + m_MixLevel: d36c0b9885263dd4db97b729dbf82021 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &8377903610078173799 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Projectile + m_AudioMixer: {fileID: 24100000} + m_GroupID: 88391c573bd80364c916040d855538c8 + m_Children: [] + m_Volume: 2c4223d0669e7fa4a9bcd208d65d7586 + m_Pitch: 204d50d8b21017e41b743bceefd553b6 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -7037003476990620901} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 +--- !u!243 &8913006207396984383 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Music + m_AudioMixer: {fileID: 24100000} + m_GroupID: aec3f58549ce7b4478c453c40c434318 + m_Children: [] + m_Volume: a449b5dff9f05be428c783227ba1ebfb + m_Pitch: fae96bdf79988494787e666372f8ef2e + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: 6357565719084711451} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 diff --git a/Assets/Audio/Audio Mixer.mixer.meta b/Assets/Audio/Audio Mixer.mixer.meta new file mode 100644 index 0000000..1f0e86f --- /dev/null +++ b/Assets/Audio/Audio Mixer.mixer.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 55dad93ba7816e44c83798006fa0a277 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 24100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects.meta b/Assets/Audio/Sound Effects.meta new file mode 100644 index 0000000..b97826c --- /dev/null +++ b/Assets/Audio/Sound Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 548dfd7daaf387244998fc1ae1ff0687 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Jump.bfxrsound b/Assets/Audio/Sound Effects/Jump.bfxrsound new file mode 100644 index 0000000..f8df804 --- /dev/null +++ b/Assets/Audio/Sound Effects/Jump.bfxrsound @@ -0,0 +1 @@ +,0.5,,0.2439,,,0.2,0.29,,0.2099,0.2649,,,,,,0.01,,,,0.2963,,,,,0.11,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Jump.bfxrsound.meta b/Assets/Audio/Sound Effects/Jump.bfxrsound.meta new file mode 100644 index 0000000..fead5d8 --- /dev/null +++ b/Assets/Audio/Sound Effects/Jump.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 43ffa6979badfe841b831bebf4dcb21c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Jump.wav b/Assets/Audio/Sound Effects/Jump.wav new file mode 100644 index 0000000000000000000000000000000000000000..0b9bde423f7922e0f5f418344a2c33d8bd7a9ded GIT binary patch literal 15966 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

G*_9c?3MS*T1hMA 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 D%R=%{ literal 0 HcmV?d00001 diff --git a/Assets/Audio/Sound Effects/Jump.wav.meta b/Assets/Audio/Sound Effects/Jump.wav.meta new file mode 100644 index 0000000..d6d9cfd --- /dev/null +++ b/Assets/Audio/Sound Effects/Jump.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: c366515880a212d45aad5408ce027da3 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 1 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Playable/Player.prefab b/Assets/Resources/Playable/Player.prefab index e9a82de..b7f9e6f 100644 --- a/Assets/Resources/Playable/Player.prefab +++ b/Assets/Resources/Playable/Player.prefab @@ -108,6 +108,7 @@ GameObject: - component: {fileID: 7008207192594766309} - component: {fileID: 7008207192594766308} - component: {fileID: 4083120737150353938} + - component: {fileID: 2092414857397911188} m_Layer: 6 m_Name: Player m_TagString: Player @@ -197,6 +198,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1e9f5de2199c4784abce74247804ce87, type: 3} m_Name: m_EditorClassIdentifier: + jumpAudioClip: {fileID: 8300000, guid: c366515880a212d45aad5408ce027da3, type: 3} --- !u!50 &7008207192594766309 Rigidbody2D: serializedVersion: 4 @@ -264,6 +266,102 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &2092414857397911188 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008207192594766305} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -2600467795151966735, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: c366515880a212d45aad5408ce027da3, type: 3} + 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 --- !u!1 &7008207193600475141 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 0a6575b..6e9fb1f 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -28,6 +28,7 @@ namespace Player private PlayerInput _controls; private Rigidbody2D _playerRigidbody2D; private SpriteRenderer _playerSpriteRenderer; + private AudioSource audioSource = null; private CollisionChecker _playerGroundTrigger; private CollisionChecker _playerWallTriggerLeft; @@ -73,6 +74,7 @@ namespace Player _canJump = true; animator = GetComponent(); + audioSource = GetComponent(); BaseSpeed = 0.0f; } @@ -220,6 +222,7 @@ namespace Player private void Jump() { + audioSource.Play(); BaseSpeed = MaxAirSpeed; _playerRigidbody2D.velocity = new Vector2(_playerRigidbody2D.velocity.x, DefaultJumpForce); _canJump = false; From 3ccc7a24b84158d01b408bf26ab8c8f06b20f177 Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 26 Feb 2022 17:57:04 +0300 Subject: [PATCH 4/6] Projectile Shooting Audio Added --- Assets/Audio/Sound Effects/Death.bfxrsound | 1 + .../Audio/Sound Effects/Death.bfxrsound.meta | 7 ++ Assets/Audio/Sound Effects/Death.wav | Bin 0 -> 10188 bytes Assets/Audio/Sound Effects/Death.wav.meta | 22 ++++ .../Sound Effects/Projectile Shot.bfxrsound | 1 + .../Projectile Shot.bfxrsound.meta | 7 ++ .../Audio/Sound Effects/Projectile Shot.wav | Bin 0 -> 10394 bytes .../Sound Effects/Projectile Shot.wav.meta | 22 ++++ ...c Shooting Patrolling Enemy Variant.prefab | 101 ++++++++++++++++++ Assets/Scripts/AI/ShootingEnemyAI.cs | 3 + 10 files changed, 164 insertions(+) create mode 100644 Assets/Audio/Sound Effects/Death.bfxrsound create mode 100644 Assets/Audio/Sound Effects/Death.bfxrsound.meta create mode 100644 Assets/Audio/Sound Effects/Death.wav create mode 100644 Assets/Audio/Sound Effects/Death.wav.meta create mode 100644 Assets/Audio/Sound Effects/Projectile Shot.bfxrsound create mode 100644 Assets/Audio/Sound Effects/Projectile Shot.bfxrsound.meta create mode 100644 Assets/Audio/Sound Effects/Projectile Shot.wav create mode 100644 Assets/Audio/Sound Effects/Projectile Shot.wav.meta diff --git a/Assets/Audio/Sound Effects/Death.bfxrsound b/Assets/Audio/Sound Effects/Death.bfxrsound new file mode 100644 index 0000000..e790a9d --- /dev/null +++ b/Assets/Audio/Sound Effects/Death.bfxrsound @@ -0,0 +1 @@ +1,0.5,,0.0341,,0.1644,0.3,0.7778,,-0.3023,,,,,,,,,,,,,,,,1,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Death.bfxrsound.meta b/Assets/Audio/Sound Effects/Death.bfxrsound.meta new file mode 100644 index 0000000..35ab150 --- /dev/null +++ b/Assets/Audio/Sound Effects/Death.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fb45fa637e425ff4c800134e68f9a646 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Death.wav b/Assets/Audio/Sound Effects/Death.wav new file mode 100644 index 0000000000000000000000000000000000000000..db43afdfd6be9d815bae639e80ae85f380e64029 GIT binary patch literal 10188 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 D4qo%2 literal 0 HcmV?d00001 diff --git a/Assets/Audio/Sound Effects/Death.wav.meta b/Assets/Audio/Sound Effects/Death.wav.meta new file mode 100644 index 0000000..e25f1f7 --- /dev/null +++ b/Assets/Audio/Sound Effects/Death.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 45157062ea57f1f4fb2271380bb846e4 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound new file mode 100644 index 0000000..96d1340 --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound @@ -0,0 +1 @@ +1,0.5,,0.1319,,0.1193,0.3,0.4149,0.0348,-0.552,,,,,,,,,,,0.6014,-0.5053,,,,1,,,0.2598,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound.meta b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound.meta new file mode 100644 index 0000000..8c7ac2b --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Shot.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 82a5f8733e6ab5b42b342641ccdb06e1 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Projectile Shot.wav b/Assets/Audio/Sound Effects/Projectile Shot.wav new file mode 100644 index 0000000000000000000000000000000000000000..6dcb1bcd846838e4c08c17def94e247c5367bb17 GIT binary patch literal 10394 zcmeI$`CC(09>?*p2}y9k4P+4|ih@NcA_yu9Zd0wT+Y}XNM6LTELe*BMl~z=gwrFXg zm1^sTii%osWm6HUSjVbWK(-K;gq;A2D1yxU*!c8${1+zo^~1UMa-Tf8pL5Rl95Q?A zlqugjOC)ps112wDvwnc3L?SW3q$G)C=R5<6p~Oq<++%-=6P|ZF$@Bq=?Fm%C$qr!;FV(Fcd8hS{`H}4L{-w z1Y;pS!CL%VC*(oM1D8pExjymwM3eC*Ka;_w*II1|I zD4{5)FsINQ5d{$iPaZva6blzr=U3?q$+ zezNRj*-O<+)dG}qEQK6rlxLJ-@Pz?XC90Ba>_-fCVy(_cB_EZ1f?$YtJ7ST512~Uc zC`BveO1V;@GgdiP8GyBj!eOK%4^5DkN=pY~ECTQ~4j~11p+P5B_^$AMGq=Dy&qXT zvT&3+$|9acJUi5KsAYt9gf^!>r@pARs5Y=Bu%>5q&uV#9kgiz*~YEl({E$9u2>T~StuY+S%ze23lGg>MiCasMz*;WEVYe?S~fkd#Zxdq4pX zOhy1cMKt!~EV598c9>U~SGZ#WW<&J-PV7MjZleh=p{P_;zKuBuLIk352KP~j7qC;? zsTG)rCD?*Uh`E&o6*^$8`ICpnLo)-buoXYy0)B@Y9dN61t9r8!Utdf8rTz=u zx#zReYo%8|kA5CnH?3QdYmsZQOR-Dy;O4>BgRBR=GI32u+!OWx0V+^~7ciE3?IS^xV9d;oR*Kig2XoPW#af=OHF&?Y25s`>R25#a$TG5FCj|V(Qjmo@w7|O6y44Qjbb?xgTEnpyvG@hQp#tr&cxv(V z?+Cy$tiutU#zmB)3YKk_Z9UD$3w`T%bxpU zEP@e_-AF|_OxsP{T`(0ZuoX%)!Qh3#i}_fLl}Lp}hed}m{((e@;{hBy9XrEt0|&bf zb`3BXV6YQeh&PNkOu_|t8F?A~fUi*qTVq?}E~73ZZ)0!c71)il_#I9rP9`HT4)0() zB9VeBl)$i?VYfl>#{z^R0^edkP9hm9l);q45QE@{k$4YFupZkGgMGMx9Nb17YG7h! zV%876;S3*4MF19K71m-mVsuWLoisa!4BSO2>LJ=Xm`ly2Jp!vf61 zG6Z22KEg(XV+*z+4&UJrenKM7;xbO-9DYTP&P~}(*+Z0~5ap;r1Df#|PhcoFluOVl z>y(+wP34xb!r#yn3JlZ{=fmKMx8a2`7!Q9;!26hvshEX%Scm}3$8xNIXxAbb>#z}F zSdUK-fi3tPJFpc|h{iXF(b+5CE04$b_z8z_1jmr5BhJs@B+lXjPD7lhAr+T#72^6D zvXG5maRZqU=db@J?g`>KaW4bck&Y`6pCyRrqd#8c{Mj0 zWsR~rh|QP=YA8{xlP}AcSV z{98ohYeZtJj;IHp;bW}R36X`!f+6aLs3D6X>PR5wA^@{61JfaD&m{Q47o*_?Pl)>D z3Q@B}y;4BbE_?Ka6?(%G<}ib(d4_l?eJO268=gSa!+MDNScM9Rnpunj5PObYh{AS6ARL>p0bvNiDlCWCuPj6$KEQ0e zk7<|!fB0fFyf6a8F%(WvpdV~tg`VK&I#Vf3V1UkUo!y?J70qZs4b%{OsS*?*7x!@o zw~&oYWFQ3>@C%ZVhy)z$CVoZKANmCJ3Fs5hC!kM2pMX9AeFFLf^a target != null && (target.transform.position - transform.position).sqrMagnitude < attackRangeSquared; @@ -44,6 +45,7 @@ namespace AI { movement = transform.GetComponentInParent(); animator = transform.GetComponentInParent(); + audioSource = transform.GetComponentInParent(); UpdateTarget(FindObjectOfType()?.transform); } @@ -90,6 +92,7 @@ namespace AI projectile.SetVelocity(velocity); remainingCooldown = cooldownPerShoot; + audioSource.Play(); OnShoot?.Invoke(); } From 5b9d21946490c2499dcc011df62644121bd348ac Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 26 Feb 2022 18:31:19 +0300 Subject: [PATCH 5/6] Death added --- Assets/Audio/Audio Mixer.mixer | 35 +++ .../Enemies/Basic Patrolling Enemy.prefab | 2 +- Assets/Resources/Playable/Player.prefab | 210 +++++++++++++++++- Assets/Scripts/AI/Projectile.cs | 4 +- Assets/Scripts/Player/Death.cs | 19 ++ Assets/Scripts/Player/Death.cs.meta | 11 + Assets/Scripts/Player/PlayerController.cs | 10 +- 7 files changed, 283 insertions(+), 8 deletions(-) create mode 100644 Assets/Scripts/Player/Death.cs create mode 100644 Assets/Scripts/Player/Death.cs.meta diff --git a/Assets/Audio/Audio Mixer.mixer b/Assets/Audio/Audio Mixer.mixer index 260be48..1e93457 100644 --- a/Assets/Audio/Audio Mixer.mixer +++ b/Assets/Audio/Audio Mixer.mixer @@ -28,6 +28,20 @@ AudioMixerEffectController: m_SendTarget: {fileID: 0} m_EnableWetMix: 0 m_Bypass: 0 +--- !u!244 &-5232129410300169738 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 8ac3a9269f49f264abc2b0c5013e1aa5 + m_EffectName: Attenuation + m_MixLevel: b1610f56bf7cf4543915d51c413eb143 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 --- !u!243 &-2600467795151966735 AudioMixerGroupController: m_ObjectHideFlags: 0 @@ -69,6 +83,7 @@ AudioMixerController: - 5c6c050f48fa1cf418601041c7d6c16f - aec3f58549ce7b4478c453c40c434318 - 88391c573bd80364c916040d855538c8 + - 08116dbf9979b7b4d8fcce772ec5ebfc name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: 24500006} @@ -85,6 +100,7 @@ AudioMixerGroupController: - {fileID: -2600467795151966735} - {fileID: 8913006207396984383} - {fileID: 8377903610078173799} + - {fileID: 6090405236815604520} m_Volume: c8ed3e32c19202b4daadc5c4fb90bf76 m_Pitch: d51ab31c176e6894b94b24c01f74415f m_Send: 00000000000000000000000000000000 @@ -119,6 +135,25 @@ AudioMixerSnapshotController: m_SnapshotID: 7b03920a55d36f54bac08488dc018422 m_FloatValues: {} m_TransitionOverrides: {} +--- !u!243 &6090405236815604520 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Death + m_AudioMixer: {fileID: 24100000} + m_GroupID: 08116dbf9979b7b4d8fcce772ec5ebfc + m_Children: [] + m_Volume: 23a0004fa1be74144ad5d7029d584609 + m_Pitch: 43f3175ec3407354bb8c0e63d6d1dde9 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -5232129410300169738} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!244 &6357565719084711451 AudioMixerEffectController: m_ObjectHideFlags: 3 diff --git a/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab b/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab index 49b3880..e394987 100644 --- a/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab +++ b/Assets/Prefabs/Enemies/Basic Patrolling Enemy.prefab @@ -290,7 +290,7 @@ Rigidbody2D: m_Material: {fileID: 0} m_Interpolate: 0 m_SleepingMode: 1 - m_CollisionDetection: 0 + m_CollisionDetection: 1 m_Constraints: 4 --- !u!114 &8503951513957676288 MonoBehaviour: diff --git a/Assets/Resources/Playable/Player.prefab b/Assets/Resources/Playable/Player.prefab index b7f9e6f..ba7e2eb 100644 --- a/Assets/Resources/Playable/Player.prefab +++ b/Assets/Resources/Playable/Player.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: layerMask: serializedVersion: 2 - m_Bits: 4294967103 + m_Bits: 4294966335 --- !u!1 &2083070160 GameObject: m_ObjectHideFlags: 0 @@ -93,7 +93,54 @@ MonoBehaviour: m_EditorClassIdentifier: layerMask: serializedVersion: 2 - m_Bits: 4294967103 + m_Bits: 4294966335 +--- !u!1 &2460162872455742730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5380164631756810673} + - component: {fileID: 3193203585355150635} + m_Layer: 6 + m_Name: Enemy Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5380164631756810673 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2460162872455742730} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.25, z: 0} + m_LocalScale: {x: 1.6, y: 1.6, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7008207192594766311} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3193203585355150635 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2460162872455742730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7000c8c0eb91b2d4cb9a0e3ee1b609a7, type: 3} + m_Name: + m_EditorClassIdentifier: + layerMask: + serializedVersion: 2 + m_Bits: 4294966912 --- !u!1 &7008207192594766305 GameObject: m_ObjectHideFlags: 0 @@ -109,6 +156,7 @@ GameObject: - component: {fileID: 7008207192594766308} - component: {fileID: 4083120737150353938} - component: {fileID: 2092414857397911188} + - component: {fileID: 7892559024328115078} m_Layer: 6 m_Name: Player m_TagString: Player @@ -131,6 +179,8 @@ Transform: - {fileID: 7008207193600475140} - {fileID: 698768805} - {fileID: 2083070161} + - {fileID: 5380164631756810673} + - {fileID: 5932034958742124507} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -198,7 +248,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1e9f5de2199c4784abce74247804ce87, type: 3} m_Name: m_EditorClassIdentifier: - jumpAudioClip: {fileID: 8300000, guid: c366515880a212d45aad5408ce027da3, type: 3} --- !u!50 &7008207192594766309 Rigidbody2D: serializedVersion: 4 @@ -362,6 +411,18 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &7892559024328115078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7008207192594766305} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c16e6ed26e877e42ba1955f39094ddf, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7008207193600475141 GameObject: m_ObjectHideFlags: 0 @@ -408,4 +469,145 @@ MonoBehaviour: m_EditorClassIdentifier: layerMask: serializedVersion: 2 - m_Bits: 4294967048 + m_Bits: 4294966280 +--- !u!1 &7718275112619760423 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5932034958742124507} + - component: {fileID: 341567328791663827} + - component: {fileID: 8364197196962726582} + m_Layer: 6 + m_Name: Death + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5932034958742124507 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718275112619760423} + 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: 7008207192594766311} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &341567328791663827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718275112619760423} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c16e6ed26e877e42ba1955f39094ddf, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!82 &8364197196962726582 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7718275112619760423} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 6090405236815604520, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: 45157062ea57f1f4fb2271380bb846e4, type: 3} + 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 diff --git a/Assets/Scripts/AI/Projectile.cs b/Assets/Scripts/AI/Projectile.cs index e747a7e..23fea04 100644 --- a/Assets/Scripts/AI/Projectile.cs +++ b/Assets/Scripts/AI/Projectile.cs @@ -6,7 +6,6 @@ namespace AI [RequireComponent(typeof(Rigidbody2D))] public class Projectile : MonoBehaviour, IPausable { - [SerializeField] protected float damageOnContact = 50f; private Rigidbody2D _rigidbody = null; private void Awake() @@ -22,6 +21,9 @@ namespace AI private void OnCollisionEnter2D(Collision2D other) { ProjectilePool.Instance.Return(this); + + if (other.transform.CompareTag("Player")) + other.gameObject.GetComponent().Die(); } public bool IsPaused { get; protected set; } = false; diff --git a/Assets/Scripts/Player/Death.cs b/Assets/Scripts/Player/Death.cs new file mode 100644 index 0000000..1f58b99 --- /dev/null +++ b/Assets/Scripts/Player/Death.cs @@ -0,0 +1,19 @@ +using Level; +using UnityEngine; + +namespace Player +{ + public class Death : MonoBehaviour + { + private AudioSource audioSource = null; + + private void Start() => audioSource = GetComponent(); + + public void Die() + { + LevelManager.Instance.CurrentLevel.Restart(); + // Playing it after the restart because when the player gets deactivated the sound stops so it doesn't play the sound at all + audioSource.Play(); + } + } +} diff --git a/Assets/Scripts/Player/Death.cs.meta b/Assets/Scripts/Player/Death.cs.meta new file mode 100644 index 0000000..66eab5c --- /dev/null +++ b/Assets/Scripts/Player/Death.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7c16e6ed26e877e42ba1955f39094ddf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerController.cs b/Assets/Scripts/Player/PlayerController.cs index 6e9fb1f..69f1cb1 100644 --- a/Assets/Scripts/Player/PlayerController.cs +++ b/Assets/Scripts/Player/PlayerController.cs @@ -2,7 +2,6 @@ using System; using Movement; using UnityEngine; using UnityEngine.InputSystem; -using UnityEngine.SceneManagement; using PlayerInput = Input.PlayerInput; namespace Player @@ -50,6 +49,8 @@ namespace Player private const string IsGroundedParameter = "IsGrounded"; private const string IsWalledParameter = "IsWalled"; private Animator animator = null; + private Death death = null; + private CollisionChecker enemyTrigger = null; private void Awake() { @@ -75,6 +76,8 @@ namespace Player animator = GetComponent(); audioSource = GetComponent(); + death = transform.Find("Death").gameObject.GetComponent(); + enemyTrigger = GameObject.Find("Enemy Trigger").GetComponent(); BaseSpeed = 0.0f; } @@ -133,12 +136,15 @@ namespace Player { _isOnAir = !_playerGroundTrigger.IsCollided; RespawnCheck(); + + if (enemyTrigger.IsCollided) + death.Die(); } private void RespawnCheck() { if (gameObject.transform.position.y < RespawnLimit) - SceneManager.LoadScene(SceneManager.GetActiveScene().name); + death.Die(); } // PAUSE METHODS From 1ce26076029338d8ece69be5b82a567efc8ca97e Mon Sep 17 00:00:00 2001 From: Syntriax Date: Sat, 26 Feb 2022 18:46:49 +0300 Subject: [PATCH 6/6] Projectile Hit Sound Added --- Assets/Audio/Audio Mixer.mixer | 39 ++++++- .../Sound Effects/Projectile Hit.bfxrsound | 1 + .../Projectile Hit.bfxrsound.meta | 7 ++ Assets/Audio/Sound Effects/Projectile Hit.wav | Bin 0 -> 22110 bytes .../Sound Effects/Projectile Hit.wav.meta | 22 ++++ .../Projectiles/Basic Projectile.prefab | 98 +++++++++++++++++- Assets/Scripts/AI/Projectile.cs | 11 +- Assets/Scripts/AI/ProjectilePool.cs | 6 +- 8 files changed, 175 insertions(+), 9 deletions(-) create mode 100644 Assets/Audio/Sound Effects/Projectile Hit.bfxrsound create mode 100644 Assets/Audio/Sound Effects/Projectile Hit.bfxrsound.meta create mode 100644 Assets/Audio/Sound Effects/Projectile Hit.wav create mode 100644 Assets/Audio/Sound Effects/Projectile Hit.wav.meta diff --git a/Assets/Audio/Audio Mixer.mixer b/Assets/Audio/Audio Mixer.mixer index 1e93457..4033f3b 100644 --- a/Assets/Audio/Audio Mixer.mixer +++ b/Assets/Audio/Audio Mixer.mixer @@ -61,6 +61,39 @@ AudioMixerGroupController: m_Mute: 0 m_Solo: 0 m_BypassEffects: 0 +--- !u!244 &-671410346139079125 +AudioMixerEffectController: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_EffectID: 34608f7a4d3499e4bb4747a42c281232 + m_EffectName: Attenuation + m_MixLevel: 2dc88c31b1b16cf4a91c0e7082919ee3 + m_Parameters: [] + m_SendTarget: {fileID: 0} + m_EnableWetMix: 0 + m_Bypass: 0 +--- !u!243 &-329335723480019797 +AudioMixerGroupController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Projectile Hit + m_AudioMixer: {fileID: 24100000} + m_GroupID: dd1cda19a45ef294d8789a2af47afcf7 + m_Children: [] + m_Volume: 2cd261abac4698e4698da002d6c5a44a + m_Pitch: 1c7ec7a4f840018488827068ccd5f583 + m_Send: 00000000000000000000000000000000 + m_Effects: + - {fileID: -671410346139079125} + m_UserColorIndex: 0 + m_Mute: 0 + m_Solo: 0 + m_BypassEffects: 0 --- !u!241 &24100000 AudioMixerController: m_ObjectHideFlags: 0 @@ -84,6 +117,7 @@ AudioMixerController: - aec3f58549ce7b4478c453c40c434318 - 88391c573bd80364c916040d855538c8 - 08116dbf9979b7b4d8fcce772ec5ebfc + - dd1cda19a45ef294d8789a2af47afcf7 name: View m_CurrentViewIndex: 0 m_TargetSnapshot: {fileID: 24500006} @@ -174,10 +208,11 @@ AudioMixerGroupController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Projectile + m_Name: Projectile Shot m_AudioMixer: {fileID: 24100000} m_GroupID: 88391c573bd80364c916040d855538c8 - m_Children: [] + m_Children: + - {fileID: -329335723480019797} m_Volume: 2c4223d0669e7fa4a9bcd208d65d7586 m_Pitch: 204d50d8b21017e41b743bceefd553b6 m_Send: 00000000000000000000000000000000 diff --git a/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound new file mode 100644 index 0000000..bfc472c --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound @@ -0,0 +1 @@ +3,0.5,,0.2297,0.6172,0.1934,0.3,0.0275,,0.1354,,,,,,,,,,,,,,,,1,,,,,,,masterVolume \ No newline at end of file diff --git a/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound.meta b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound.meta new file mode 100644 index 0000000..ac9cb6f --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Hit.bfxrsound.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4aa857170acca284b9ce4bc83d44dd99 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Audio/Sound Effects/Projectile Hit.wav b/Assets/Audio/Sound Effects/Projectile Hit.wav new file mode 100644 index 0000000000000000000000000000000000000000..d917e7fa18a16e1eb59e182176bfedd908d2675b GIT binary patch literal 22110 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 Pz?&U-vjhL1ci{g3D|ul2 literal 0 HcmV?d00001 diff --git a/Assets/Audio/Sound Effects/Projectile Hit.wav.meta b/Assets/Audio/Sound Effects/Projectile Hit.wav.meta new file mode 100644 index 0000000..4cff908 --- /dev/null +++ b/Assets/Audio/Sound Effects/Projectile Hit.wav.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 59d0430fe628a2a4da8634f4c1e01c9b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Projectiles/Basic Projectile.prefab b/Assets/Resources/Projectiles/Basic Projectile.prefab index 6fdd225..f482768 100644 --- a/Assets/Resources/Projectiles/Basic Projectile.prefab +++ b/Assets/Resources/Projectiles/Basic Projectile.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 5084819958108693599} - component: {fileID: 6837629660644296000} - component: {fileID: 2154021251853475818} + - component: {fileID: 4197101675176415021} m_Layer: 9 m_Name: Basic Projectile m_TagString: Untagged @@ -137,7 +138,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1451960c367cc30478631b32ba4f8356, type: 3} m_Name: m_EditorClassIdentifier: - damageOnContact: 50 --- !u!95 &2154021251853475818 Animator: serializedVersion: 4 @@ -158,3 +158,99 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!82 &4197101675176415021 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2196707779812385060} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: -329335723480019797, guid: 55dad93ba7816e44c83798006fa0a277, type: 2} + m_audioClip: {fileID: 8300000, guid: 59d0430fe628a2a4da8634f4c1e01c9b, type: 3} + 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 diff --git a/Assets/Scripts/AI/Projectile.cs b/Assets/Scripts/AI/Projectile.cs index 23fea04..02508da 100644 --- a/Assets/Scripts/AI/Projectile.cs +++ b/Assets/Scripts/AI/Projectile.cs @@ -6,21 +6,24 @@ namespace AI [RequireComponent(typeof(Rigidbody2D))] public class Projectile : MonoBehaviour, IPausable { - private Rigidbody2D _rigidbody = null; + public Rigidbody2D Rigidbody { get; private set; } = null; + private AudioSource audioSource = null; private void Awake() { - _rigidbody = GetComponent(); + Rigidbody = GetComponent(); + audioSource = GetComponent(); } public void SetVelocity(Vector2 velocity) { - _rigidbody.velocity = velocity; + Rigidbody.velocity = velocity; } private void OnCollisionEnter2D(Collision2D other) { ProjectilePool.Instance.Return(this); + audioSource.Play(); if (other.transform.CompareTag("Player")) other.gameObject.GetComponent().Die(); @@ -41,7 +44,7 @@ namespace AI private void UpdateRigidbody() { - _rigidbody.simulated = !IsPaused; + Rigidbody.simulated = !IsPaused; } } } diff --git a/Assets/Scripts/AI/ProjectilePool.cs b/Assets/Scripts/AI/ProjectilePool.cs index 500fc7b..35b95e1 100644 --- a/Assets/Scripts/AI/ProjectilePool.cs +++ b/Assets/Scripts/AI/ProjectilePool.cs @@ -42,14 +42,16 @@ namespace AI if (projectile == null) projectile = Instantiate(prefab).GetComponent(); - projectile.gameObject.SetActive(true); + projectile.transform.position = Vector3.left * 10000; + projectile.Rigidbody.simulated = true; return projectile; } public void Return(Projectile projectile) { - projectile.gameObject.SetActive(false); + projectile.Rigidbody.simulated = false; + projectile.transform.position = Vector3.right * 10000; pool.Push(projectile); } }