From fb24537dafcce925de8d39eefdc05e3ca4b5d26a Mon Sep 17 00:00:00 2001 From: DamianCorazza <79833283+DamianCorazza@users.noreply.github.com> Date: Tue, 30 Sep 2025 15:52:37 +0200 Subject: [PATCH] Implemented Picnic Logic (It can use some improvement) --- .../PicnicPPL/Anim_PicnicPPL_Angry.anim | 62 +- .../PicnicPPL/Anim_PicnicPPL_Distracted.anim | 4 +- .../PicnicPPL/Anim_PicnicPPL_Flirting.anim | 4 +- .../PicnicPPL/LongAnimPicnicPPLShoo.anim | 188 ++++- .../PicnicPPL/PicnicPPL_Animator.controller | 110 +-- Assets/Scenes/Levels/Quarry.unity | 768 ++++++++++++++++-- Assets/Scripts/DamianExperiments/Picnic.meta | 8 + .../Picnic/PicnicBehaviour.cs | 85 ++ .../Picnic/PicnicBehaviour.cs.meta | 2 + 9 files changed, 1077 insertions(+), 154 deletions(-) create mode 100644 Assets/Scripts/DamianExperiments/Picnic.meta create mode 100644 Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs create mode 100644 Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs.meta diff --git a/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Angry.anim b/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Angry.anim index 1ee8c07c..c93bfb33 100644 --- a/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Angry.anim +++ b/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Angry.anim @@ -22,60 +22,60 @@ AnimationClip: curve: - time: 0 value: {fileID: -2750537682534617798, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.083333336 + - time: 0.016666668 value: {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.16666667 + - time: 0.033333335 value: {fileID: 1368304682000560889, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.23333333 + - time: 0.05 value: {fileID: 5148152578091295131, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.31666666 + - time: 0.06666667 value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.4 + - time: 0.083333336 value: {fileID: -2624835572783650142, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.43333334 - value: {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.48333332 + - time: 0.1 value: {fileID: 1480404424803140867, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.56666666 + - time: 0.18333334 value: {fileID: 4734585827436184375, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.6333333 + - time: 0.2 value: {fileID: 5797253797174565556, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.71666664 + - time: 0.21666667 value: {fileID: 3161109987679049733, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.8 + - time: 0.26666668 value: {fileID: 6661843629064032450, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.8833333 + - time: 0.3 value: {fileID: -1446816102361218634, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.96666664 + - time: 0.33333334 value: {fileID: -6694388007177635723, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.0333333 + - time: 0.36666667 value: {fileID: -1324742394439945141, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.1166667 + - time: 0.4 value: {fileID: 240858685518691627, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.2 + - time: 0.43333334 value: {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.2833333 + - time: 0.46666667 value: {fileID: 7198661290457402786, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.3666667 + - time: 0.5 value: {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.4333333 + - time: 0.53333336 value: {fileID: -6630282325460440043, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.5166667 + - time: 0.56666666 value: {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.6 + - time: 0.6 value: {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.6833333 + - time: 0.6333333 value: {fileID: 2728646838695724461, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.7666667 + - time: 0.6666667 value: {fileID: -2581698265875387897, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.8333334 + - time: 0.7 value: {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 1.9166666 + - time: 0.73333335 value: {fileID: 4086135313560770538, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 2 + - time: 0.76666665 value: {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.8 + value: {fileID: -2418630947029704618, guid: fbbc627f5a8f06e47a23369fd19f3998, type: 3} attribute: m_Sprite - path: + path: Picnic PPL Chilling/PicnicPPl classID: 212 script: {fileID: 0} flags: 2 @@ -87,7 +87,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 690650095 attribute: 0 script: {fileID: 0} typeID: 212 @@ -102,7 +102,6 @@ AnimationClip: - {fileID: 5148152578091295131, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: -2624835572783650142, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 1480404424803140867, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 4734585827436184375, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 5797253797174565556, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} @@ -123,12 +122,13 @@ AnimationClip: - {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 4086135313560770538, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -2418630947029704618, guid: fbbc627f5a8f06e47a23369fd19f3998, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 2.0166667 + m_StopTime: 0.81666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Distracted.anim b/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Distracted.anim index 6154d58d..8c54286a 100644 --- a/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Distracted.anim +++ b/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Distracted.anim @@ -31,7 +31,7 @@ AnimationClip: - time: 0.5 value: {fileID: 987614732349934808, guid: cba56854f51756c48aa78d8ce5b64418, type: 3} attribute: m_Sprite - path: + path: Picnic PPL Distracted/PicnicPPl classID: 212 script: {fileID: 0} flags: 2 @@ -43,7 +43,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 1518854941 attribute: 0 script: {fileID: 0} typeID: 212 diff --git a/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Flirting.anim b/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Flirting.anim index 8bb535f2..8fbf1451 100644 --- a/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Flirting.anim +++ b/Assets/Art/Animations/Characters/PicnicPPL/Anim_PicnicPPL_Flirting.anim @@ -79,7 +79,7 @@ AnimationClip: - time: 2 value: {fileID: 6624740418941178713, guid: fbbc627f5a8f06e47a23369fd19f3998, type: 3} attribute: m_Sprite - path: + path: Picnic PPL Chilling/PicnicPPl classID: 212 script: {fileID: 0} flags: 2 @@ -91,7 +91,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 690650095 attribute: 0 script: {fileID: 0} typeID: 212 diff --git a/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim b/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim index 2fc490da..707f6bb7 100644 --- a/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim +++ b/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim @@ -22,8 +22,6 @@ AnimationClip: curve: - time: 0 value: {fileID: -2750537682534617798, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.033333335 - value: {fileID: -2750537682534617798, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.033333335 value: {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.05 @@ -54,16 +52,12 @@ AnimationClip: value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.36666667 value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.36666667 - value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.38333333 value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.41666666 value: {fileID: -2624835572783650142, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.43333334 value: {fileID: 1480404424803140867, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.46666667 - value: {fileID: 4734585827436184375, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.46666667 value: {fileID: 5797253797174565556, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.5 @@ -90,16 +84,12 @@ AnimationClip: value: {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.75 value: {fileID: 7198661290457402786, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.78333336 - value: {fileID: 7198661290457402786, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.78333336 value: {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.8 value: {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.8333333 value: {fileID: -6630282325460440043, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - time: 0.8666667 - value: {fileID: -6630282325460440043, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.8666667 value: {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 0.8833333 @@ -130,6 +120,115 @@ AnimationClip: value: {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 1.2 value: {fileID: 4086135313560770538, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.2166667 + value: {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.25 + value: {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + attribute: m_Sprite + path: Picnic PPL Angry/PicnicPPl + classID: 212 + script: {fileID: 0} + flags: 2 + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -2750537682534617798, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.033333335 + value: {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.05 + value: {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.083333336 + value: {fileID: 1368304682000560889, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.11666667 + value: {fileID: 1368304682000560889, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.13333334 + value: {fileID: 5148152578091295131, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.15 + value: {fileID: 5148152578091295131, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.18333334 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.2 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.21666667 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.23333333 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.26666668 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.28333333 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.3 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.33333334 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.36666667 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.38333333 + value: {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.41666666 + value: {fileID: -2624835572783650142, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.43333334 + value: {fileID: 1480404424803140867, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.46666667 + value: {fileID: 5797253797174565556, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.5 + value: {fileID: 3161109987679049733, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.53333336 + value: {fileID: 6661843629064032450, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.55 + value: {fileID: -1446816102361218634, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.56666666 + value: {fileID: -6694388007177635723, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.6 + value: {fileID: -6694388007177635723, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.6166667 + value: {fileID: -1324742394439945141, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.6333333 + value: {fileID: -1324742394439945141, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.65 + value: {fileID: 240858685518691627, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.68333334 + value: {fileID: 240858685518691627, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.7 + value: {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.71666664 + value: {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.75 + value: {fileID: 7198661290457402786, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.78333336 + value: {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.8 + value: {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.8333333 + value: {fileID: -6630282325460440043, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.8666667 + value: {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.8833333 + value: {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.9166667 + value: {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.95 + value: {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.96666664 + value: {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 0.98333335 + value: {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.0166667 + value: {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.0333333 + value: {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.05 + value: {fileID: 2728646838695724461, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.0666667 + value: {fileID: 2728646838695724461, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.1 + value: {fileID: -2581698265875387897, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.1166667 + value: {fileID: -2581698265875387897, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.1333333 + value: {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - time: 1.1666666 + value: {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 1.2 value: {fileID: 4086135313560770538, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - time: 1.2166667 @@ -137,7 +236,7 @@ AnimationClip: - time: 1.25 value: {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} attribute: m_Sprite - path: + path: Picnic PPL Chilling/PicnicPPl classID: 212 script: {fileID: 0} flags: 2 @@ -149,7 +248,16 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 2091992553 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 690650095 attribute: 0 script: {fileID: 0} typeID: 212 @@ -159,7 +267,6 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: -2750537682534617798, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - {fileID: -2750537682534617798, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 1368304682000560889, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} @@ -176,10 +283,8 @@ AnimationClip: - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: -2624835572783650142, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 1480404424803140867, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - {fileID: 4734585827436184375, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 5797253797174565556, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 3161109987679049733, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 6661843629064032450, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} @@ -193,11 +298,9 @@ AnimationClip: - {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 7198661290457402786, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - {fileID: 7198661290457402786, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: -6630282325460440043, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - - {fileID: -6630282325460440043, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} @@ -213,6 +316,57 @@ AnimationClip: - {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 4086135313560770538, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -2750537682534617798, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 1313958663299761363, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 1368304682000560889, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 1368304682000560889, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5148152578091295131, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5148152578091295131, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5175152572798960515, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -2624835572783650142, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 1480404424803140867, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5797253797174565556, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 3161109987679049733, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 6661843629064032450, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -1446816102361218634, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -6694388007177635723, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -6694388007177635723, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -1324742394439945141, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -1324742394439945141, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 240858685518691627, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 240858685518691627, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -1336080830172673940, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 7198661290457402786, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 5039228973940303016, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -6630282325460440043, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -3351056254805331608, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 3654700337104154398, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 2728646838695724461, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 2728646838695724461, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -2581698265875387897, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -2581698265875387897, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: -6943440077437072623, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 4086135313560770538, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} - {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} diff --git a/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller b/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller index c9d86f0c..7130988a 100644 --- a/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller +++ b/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller @@ -1,27 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1101 &-8049720120999465516 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 564437090677851590} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.87603307 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &-7558122856987167529 AnimatorState: serializedVersion: 6 @@ -63,13 +41,13 @@ AnimatorStateMachine: m_Position: {x: 30, y: 230, z: 0} - serializedVersion: 1 m_State: {fileID: 4132696506529250174} - m_Position: {x: 360, y: 230, z: 0} + m_Position: {x: 360, y: 290, z: 0} - serializedVersion: 1 m_State: {fileID: -7558122856987167529} m_Position: {x: 30, y: 370, z: 0} - serializedVersion: 1 m_State: {fileID: 1286523504048593293} - m_Position: {x: 390, y: 370, z: 0} + m_Position: {x: 400, y: 100, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -97,10 +75,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.516129 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -122,10 +100,35 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.87603307 - m_HasExitTime: 1 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-159810724103494173 +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: theyAngry + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4132696506529250174} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.87603307 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -175,8 +178,8 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 3087410442764859200} - {fileID: -4519341069038553901} + - {fileID: -159810724103494173} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -192,6 +195,28 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &622718680960508754 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 564437090677851590} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75409836 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1286523504048593293 AnimatorState: serializedVersion: 6 @@ -218,31 +243,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &3087410442764859200 -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: theyAngry - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 4132696506529250174} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.87603307 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1102 &4132696506529250174 AnimatorState: serializedVersion: 6 @@ -254,7 +254,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: -8049720120999465516} + - {fileID: 622718680960508754} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index ba114e47..9dcf5cee 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -718,6 +718,96 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} +--- !u!1 &34905613 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 34905614} + - component: {fileID: 34905615} + m_Layer: 0 + m_Name: PicnicPPl + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &34905614 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34905613} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.20535278, y: -3.4601898, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1943192894} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &34905615 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 34905613} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: -2418630947029704618, guid: fbbc627f5a8f06e47a23369fd19f3998, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 11.341844, y: 8.96} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &63234684 PrefabInstance: m_ObjectHideFlags: 0 @@ -1597,6 +1687,130 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 135189317} m_Mesh: {fileID: 4300000, guid: eae229cde7c374059a09c8052360682c, type: 3} +--- !u!1 &143210809 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 143210813} + - component: {fileID: 143210812} + - component: {fileID: 143210811} + - component: {fileID: 143210810} + - component: {fileID: 143210814} + m_Layer: 0 + m_Name: Picnic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!95 &143210810 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143210809} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: eee8123c456227a48825e19aa0f3711a, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!114 &143210811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143210809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9e0b24e2f2ad54cc09940c320ed3cf4b, type: 3} + m_Name: + m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.StateMachine + defaultState: {fileID: 1230441486} + currentState: {fileID: 0} + _unityEventsFolded: 0 + verbose: 0 + allowReentry: 0 + returnToDefaultOnDisable: 1 + OnStateExited: + m_PersistentCalls: + m_Calls: [] + OnStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateEntered: + m_PersistentCalls: + m_Calls: [] + OnFirstStateExited: + m_PersistentCalls: + m_Calls: [] + OnLastStateEntered: + m_PersistentCalls: + m_Calls: [] + OnLastStateExited: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &143210812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143210809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55938fb1577dd4ad3af7e994048c86f6, type: 3} + m_Name: + m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.Initialization +--- !u!4 &143210813 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143210809} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 61.67, y: 35.16, z: 0} + m_LocalScale: {x: 1.18, y: 1.18, z: 1.18} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 1230441488} + - {fileID: 1943192894} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &143210814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143210809} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a0d74ee1aa43b54ab5d08005bdd9b16, type: 3} + m_Name: + m_EditorClassIdentifier: '::' + getDistractedMin: 5 + getDistractedMax: 8 + getFlirtyMin: 4 + getFlirtyMax: 5 + fakeChocolate: {fileID: 874984580} --- !u!1 &146130588 GameObject: m_ObjectHideFlags: 0 @@ -431777,12 +431991,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 317149912} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 64.61, y: 32.43, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.1846466, y: -3.9101906, z: 0} m_LocalScale: {x: 0.58, y: 0.58, z: 0.58} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1230441488} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &317696669 PrefabInstance: @@ -434786,15 +435000,15 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1943192894} m_Modifications: - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.x - value: 60.12 + value: -6.784 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.y - value: 34.71 + value: -2.901 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.z @@ -434806,15 +435020,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -434828,6 +435042,34 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5115031108386170345, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5115031108386170345, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5115031108386170345, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 143210814} + - target: {fileID: 5115031108386170345, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5115031108386170345, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: destroyFakeChocolate + objectReference: {fileID: 0} + - target: {fileID: 5115031108386170345, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: PicnicBehaviour, AppleHillsScripts + objectReference: {fileID: 0} + - target: {fileID: 5115031108386170345, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + propertyPath: characterArrived.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 5137140128224035451, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_FlipX value: 1 @@ -434841,6 +435083,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b3fc964bec385174f85a143f2fcff121, type: 3} +--- !u!4 &520186665 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} + m_PrefabInstance: {fileID: 520186664} + m_PrefabAsset: {fileID: 0} --- !u!4 &526812634 stripped Transform: m_CorrespondingSourceObject: {fileID: 7815739457642955130, guid: f645a67c7970b124cacb6450fefdebad, type: 3} @@ -437180,6 +437427,96 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 697303079} m_PrefabAsset: {fileID: 0} +--- !u!1 &697899127 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 697899128} + - component: {fileID: 697899129} + m_Layer: 0 + m_Name: Picknic Cloth + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &697899128 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697899127} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.03465271, y: -3.6901894, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1943192894} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &697899129 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 697899127} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 9105513792776133627, guid: 140f82f54aeb07e409575fe55dc6df14, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 24.45, y: 11.250001} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &702911162 PrefabInstance: m_ObjectHideFlags: 0 @@ -437578,7 +437915,6 @@ GameObject: m_Component: - component: {fileID: 719063943} - component: {fileID: 719063942} - - component: {fileID: 719063941} m_Layer: 0 m_Name: PicnicPPl m_TagString: Untagged @@ -437586,28 +437922,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!95 &719063941 -Animator: - serializedVersion: 7 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 719063940} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: eee8123c456227a48825e19aa0f3711a, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_AnimatePhysics: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!212 &719063942 SpriteRenderer: m_ObjectHideFlags: 0 @@ -437674,12 +437988,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 719063940} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 70, y: 32.88, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.20535278, y: -3.4601898, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1230441488} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &733706650 stripped GameObject: @@ -439214,6 +439528,183 @@ Transform: m_CorrespondingSourceObject: {fileID: 2064225848720495177, guid: 0bbded61e58193848ac59c8eea761bcc, type: 3} m_PrefabInstance: {fileID: 862735499} m_PrefabAsset: {fileID: 0} +--- !u!1 &874984580 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 874984581} + - component: {fileID: 874984584} + - component: {fileID: 874984583} + - component: {fileID: 874984582} + m_Layer: 10 + m_Name: FakeChoco + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &874984581 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874984580} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.784, y: -2.901, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1230441488} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &874984582 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874984580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 73d6494a73174ffabc6a7d3089d51e73, type: 3} + m_Name: + m_EditorClassIdentifier: + isOneTime: 0 + cooldown: -1 + characterToInteract: 1 + interactionStarted: + m_PersistentCalls: + m_Calls: [] + interactionInterrupted: + m_PersistentCalls: + m_Calls: [] + characterArrived: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 143210814} + m_TargetAssemblyTypeName: PicnicBehaviour, AppleHillsScripts + m_MethodName: triedToStealChocolate + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + interactionComplete: + m_PersistentCalls: + m_Calls: [] +--- !u!61 &874984583 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874984580} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.34, y: 1.53} + newSize: {x: 1.34, y: 1.53} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2, y: 2} + m_EdgeRadius: 0 +--- !u!212 &874984584 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874984580} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: -509776585262497855, guid: c648336c825f7d7479582bbe4d95d0bc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.34, y: 1.53} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &886935940 PrefabInstance: m_ObjectHideFlags: 0 @@ -443211,6 +443702,96 @@ Transform: m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} m_PrefabInstance: {fileID: 1132246246} m_PrefabAsset: {fileID: 0} +--- !u!1 &1133848503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1133848504} + - component: {fileID: 1133848505} + m_Layer: 0 + m_Name: PicnicBasket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1133848504 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133848503} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.1846466, y: -3.9101906, z: 0} + m_LocalScale: {x: 0.58, y: 0.58, z: 0.58} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 1943192894} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1133848505 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1133848503} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 277634131431117102, guid: 2cf4a5af200e48347b7dcd0dbd84d9ca, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.1200004, y: 6.89} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1137411209 GameObject: m_ObjectHideFlags: 0 @@ -444713,6 +445294,54 @@ Transform: m_Children: [] m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 7.957} +--- !u!1 &1230441486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1230441488} + - component: {fileID: 1230441487} + m_Layer: 0 + m_Name: Picnic PPL Chilling + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1230441487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230441486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Name: + m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.State +--- !u!4 &1230441488 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1230441486} + 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: 719063943} + - {fileID: 317149914} + - {fileID: 1631506257} + - {fileID: 874984581} + m_Father: {fileID: 143210813} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1252594308 GameObject: m_ObjectHideFlags: 0 @@ -449568,12 +450197,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1631506255} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 69.759995, y: 32.65, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.03465271, y: -3.6901894, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 0} + m_Father: {fileID: 1230441488} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1634570135 GameObject: @@ -454161,6 +454790,54 @@ Transform: m_CorrespondingSourceObject: {fileID: 6638967295122936466, guid: f4ac8282240dd544e9a92e7635486fd1, type: 3} m_PrefabInstance: {fileID: 5541405231515088532} m_PrefabAsset: {fileID: 0} +--- !u!1 &1943192893 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1943192894} + - component: {fileID: 1943192895} + m_Layer: 0 + m_Name: Picnic PPL Distracted + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1943192894 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943192893} + 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: 34905614} + - {fileID: 1133848504} + - {fileID: 697899128} + - {fileID: 520186665} + m_Father: {fileID: 143210813} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1943192895 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1943192893} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: eaefd3d5a2a864ca5b5d9ec5f2a7040f, type: 3} + m_Name: + m_EditorClassIdentifier: PixelplacementAssembly::Pixelplacement.State --- !u!1001 &1944202997 PrefabInstance: m_ObjectHideFlags: 0 @@ -456583,11 +457260,11 @@ PrefabInstance: m_Modifications: - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.x - value: 7.4399986 + value: 7.439999 objectReference: {fileID: 0} - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.y - value: 11.469999 + value: 11.47 objectReference: {fileID: 0} - target: {fileID: 1592061707390547073, guid: 7be57ba4ecd292f4c90169045a2d69e4, type: 3} propertyPath: m_LocalPosition.z @@ -457472,15 +458149,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6165893904866732969, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_SpriteTilingProperty.pivot.y - value: 0.2 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 6165893904866732969, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_SpriteTilingProperty.oldSize.x - value: 3.1100001 + value: 2.08 objectReference: {fileID: 0} - target: {fileID: 6165893904866732969, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_SpriteTilingProperty.oldSize.y - value: 3.6912465 + value: 2.83 objectReference: {fileID: 0} - target: {fileID: 6458149385295467297, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_LocalPosition.x @@ -458587,7 +459264,4 @@ SceneRoots: - {fileID: 1101333109} - {fileID: 4912039252317080710} - {fileID: 12163667} - - {fileID: 719063943} - - {fileID: 1631506257} - - {fileID: 317149914} - - {fileID: 520186664} + - {fileID: 143210813} diff --git a/Assets/Scripts/DamianExperiments/Picnic.meta b/Assets/Scripts/DamianExperiments/Picnic.meta new file mode 100644 index 00000000..2f151311 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/Picnic.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 152828d0655f5c14cae91cf1cf71fd39 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs b/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs new file mode 100644 index 00000000..ac2a6a9f --- /dev/null +++ b/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs @@ -0,0 +1,85 @@ +using UnityEngine; +using Pixelplacement; +using System.Collections; + +public class PicnicBehaviour : MonoBehaviour +{ + [Header("Random Call Settings")] + public float getDistractedMin = 2f; + public float getDistractedMax = 5f; + public float getFlirtyMin = 1f; + public float getFlirtyMax = 3f; + + private StateMachine stateMachine; + private Animator animator; + + [Header("The FakeChocolate to destroy!")] + [SerializeField] private GameObject fakeChocolate; // Assign in Inspector + + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + StartCoroutine(RandomFirstMethodRoutine()); + } + + void Awake() + { + stateMachine = GetComponent(); + animator = GetComponent(); + } + + // Update is called once per frame + void Update() + { + + } + + private IEnumerator RandomFirstMethodRoutine() + { + while (true) + { + float waitTime = Random.Range(getDistractedMin, getDistractedMax); + yield return new WaitForSeconds(waitTime); + FirstMethod(); + } + } + + private void FirstMethod() + { + Debug.Log("First method called!"); + stateMachine.ChangeState("Picnic PPL Distracted"); + animator.SetBool("theyDistracted", true); + StartCoroutine(RandomSecondMethodRoutine()); + } + + private IEnumerator RandomSecondMethodRoutine() + { + float waitTime = Random.Range(getFlirtyMin, getFlirtyMax); + yield return new WaitForSeconds(waitTime); + SecondMethod(); + } + + private void SecondMethod() + { + Debug.Log("Second method called!"); + stateMachine.ChangeState("Picnic PPL Chilling"); + animator.SetBool("theyDistracted", false); + } + + public void triedToStealChocolate() + { + animator.SetTrigger("theyAngry"); + //stateMachine.ChangeState("Picnic PPL Angry"); + Debug.Log("Hey! Don't steal my chocolate!"); + } + + public void destroyFakeChocolate() + { + if (fakeChocolate != null) + { + Destroy(fakeChocolate); + fakeChocolate = null; // Optional: clear reference + } + } + +} diff --git a/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs.meta b/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs.meta new file mode 100644 index 00000000..53250b51 --- /dev/null +++ b/Assets/Scripts/DamianExperiments/Picnic/PicnicBehaviour.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 0a0d74ee1aa43b54ab5d08005bdd9b16 \ No newline at end of file