diff --git a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim index 82b0a9ea..2cad808e 100644 --- a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim +++ b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim @@ -21,35 +21,65 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -4526961168388097183, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.06666667 - value: {fileID: 6678378708250765366, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.15 - value: {fileID: 5257109183276098871, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.21666667 - value: {fileID: -6365386246741988032, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: -5887797107415598781, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.033333335 + value: {fileID: 4182169172090052087, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.083333336 + value: {fileID: 5581204054166165482, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.11666667 + value: {fileID: 6281513458818790246, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.16666667 + value: {fileID: -2157038173507977873, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.2 + value: {fileID: 7675767991158271130, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.23333333 + value: {fileID: -3809834153560938047, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.28333333 - value: {fileID: -6166410269971174550, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.35 - value: {fileID: -697087381347587415, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.43333334 - value: {fileID: -8526899043302120773, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.5 - value: {fileID: -2697202594669319986, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 7797799588708644691, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.31666666 + value: {fileID: -3694855373773427773, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.36666667 + value: {fileID: -772774839854160401, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.4 + value: {fileID: 2775065027350882613, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.45 + value: {fileID: -5969551015847070333, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.48333332 + value: {fileID: -6815726516011099956, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.51666665 + value: {fileID: 3018889940081707026, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.56666666 - value: {fileID: 1537021138919000452, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 3490090362724945448, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.6 + value: {fileID: 4386831219829939925, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.65 - value: {fileID: -441064275176934823, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: -6530143234255615529, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.68333334 + value: {fileID: 7096009967814692052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.71666664 - value: {fileID: -3513104290579005075, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 0.78333336 - value: {fileID: -3332844303632730036, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 6319826433179223563, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.76666665 + value: {fileID: -5952344288683761052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.8 + value: {fileID: -7201094444470444464, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.85 - value: {fileID: -1408805331151090596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 2104556673111889494, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.8833333 + value: {fileID: -3089917731664936424, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 0.93333334 - value: {fileID: 7381092181848048596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: 8331946793720757423, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 0.96666664 + value: {fileID: -3625782473088726632, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - time: 1 - value: {fileID: -3846425930340267890, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + value: {fileID: -7661119854620563729, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.05 + value: {fileID: -5647685865876279807, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.0833334 + value: {fileID: 7992653244893361835, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.1333333 + value: {fileID: 5254102076834024576, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - time: 1.1666666 + value: {fileID: -523328932758371747, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} attribute: m_Sprite path: classID: 212 @@ -72,27 +102,42 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -4526961168388097183, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 6678378708250765366, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 5257109183276098871, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -6365386246741988032, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -6166410269971174550, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -697087381347587415, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -8526899043302120773, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -2697202594669319986, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 1537021138919000452, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -441064275176934823, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -3513104290579005075, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -3332844303632730036, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -1408805331151090596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 7381092181848048596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -3846425930340267890, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + - {fileID: -5887797107415598781, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 4182169172090052087, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 5581204054166165482, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 6281513458818790246, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -2157038173507977873, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7675767991158271130, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3809834153560938047, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7797799588708644691, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3694855373773427773, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -772774839854160401, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 2775065027350882613, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -5969551015847070333, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -6815726516011099956, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 3018889940081707026, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 3490090362724945448, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 4386831219829939925, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -6530143234255615529, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7096009967814692052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 6319826433179223563, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -5952344288683761052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -7201094444470444464, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 2104556673111889494, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3089917731664936424, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 8331946793720757423, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -3625782473088726632, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -7661119854620563729, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -5647685865876279807, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 7992653244893361835, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: 5254102076834024576, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + - {fileID: -523328932758371747, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 1.1833333 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 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..eaaba7b9 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: 260, y: 230, z: 0} - serializedVersion: 1 m_State: {fileID: -7558122856987167529} - m_Position: {x: 30, y: 370, z: 0} + m_Position: {x: 30, y: 300, 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/Art/Animations/UI.meta b/Assets/Art/Animations/UI.meta new file mode 100644 index 00000000..4ded645b --- /dev/null +++ b/Assets/Art/Animations/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af178bd3aaf784f43aa6b970ec305bce +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/UI/ThoughtBubble.meta b/Assets/Art/Animations/UI/ThoughtBubble.meta new file mode 100644 index 00000000..0ffe09c9 --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 264de2624c972e74ab1b6e64bf981c6c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleBig.anim b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleBig.anim new file mode 100644 index 00000000..5feef792 --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleBig.anim @@ -0,0 +1,87 @@ +%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: ThoughtBubbleBig + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -5183369656504278108, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.16666667 + value: {fileID: -3929900875612406980, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.33333334 + value: {fileID: -8173383300302364078, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.5 + value: {fileID: -8130988047145614680, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.6666667 + value: {fileID: -8173383300302364078, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.8333333 + value: {fileID: -3929900875612406980, guid: c42378f5c592d2e419febb47325d501f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -5183369656504278108, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: -3929900875612406980, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: -8173383300302364078, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: -8130988047145614680, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: -8173383300302364078, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: -3929900875612406980, guid: c42378f5c592d2e419febb47325d501f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.84999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Art/Animations/UI/ThoughtBubble/ThoughtBubbleBig.anim.meta b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleBig.anim.meta new file mode 100644 index 00000000..9d5a1d1a --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleBig.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5f588062f9fe69247af9d6871de77243 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleController.controller b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleController.controller new file mode 100644 index 00000000..dc36ac9b --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleController.controller @@ -0,0 +1,251 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-7821753383854330623 +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: -5132139090288409958} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-5693892251136705929 +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: -2266976322903511837} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7058823 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-5132139090288409958 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThoughtBubbleBig + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -5693892251136705929} + 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: 5f588062f9fe69247af9d6871de77243, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-2266976322903511837 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThoughtBubbleMedium 0 + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6261137601807189324} + 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: 8da9287d027064b49bcaa0abda14d54a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThoughtBubbleController + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2147693750276977572} + 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!1107 &2147693750276977572 +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: -5132139090288409958} + m_Position: {x: 510, y: 210, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4212575545513764377} + m_Position: {x: 260, y: 280, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4319906167311943052} + m_Position: {x: 30, y: 210, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2266976322903511837} + m_Position: {x: 260, y: 160, 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: 4319906167311943052} +--- !u!1102 &4212575545513764377 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThoughtBubbleMedium + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -7821753383854330623} + 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: 8da9287d027064b49bcaa0abda14d54a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &4319906167311943052 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ThoughtBubbleSmall + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6110219784234251033} + 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: 1cc3ee403007f0b4f9e5277462b07e85, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &6110219784234251033 +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: 4212575545513764377} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6261137601807189324 +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: 4319906167311943052} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.7058823 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleController.controller.meta b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleController.controller.meta new file mode 100644 index 00000000..7ef4322e --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleController.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e0f7b1ec0f2a1140bbf9539024ace40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleMedium.anim b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleMedium.anim new file mode 100644 index 00000000..1b031d3c --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleMedium.anim @@ -0,0 +1,87 @@ +%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: ThoughtBubbleMedium + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: -4876614219090653406, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.16666667 + value: {fileID: 546509677799411972, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.33333334 + value: {fileID: 4082558685819048054, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.5 + value: {fileID: 1599714215466394667, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.6666667 + value: {fileID: 4082558685819048054, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.8333333 + value: {fileID: 546509677799411972, guid: c42378f5c592d2e419febb47325d501f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: -4876614219090653406, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 546509677799411972, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 4082558685819048054, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 1599714215466394667, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 4082558685819048054, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 546509677799411972, guid: c42378f5c592d2e419febb47325d501f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.84999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Art/Animations/UI/ThoughtBubble/ThoughtBubbleMedium.anim.meta b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleMedium.anim.meta new file mode 100644 index 00000000..2eb9e368 --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleMedium.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8da9287d027064b49bcaa0abda14d54a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleSmall.anim b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleSmall.anim new file mode 100644 index 00000000..8f42f2ad --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleSmall.anim @@ -0,0 +1,87 @@ +%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: ThoughtBubbleSmall + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 5283048045654705310, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.16666667 + value: {fileID: -2820677304421627773, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.33333334 + value: {fileID: 8288382649714367318, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.5 + value: {fileID: 372642011444542933, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.6666667 + value: {fileID: 8288382649714367318, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - time: 0.8333333 + value: {fileID: -2820677304421627773, guid: c42378f5c592d2e419febb47325d501f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 5283048045654705310, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: -2820677304421627773, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 8288382649714367318, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 372642011444542933, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: 8288382649714367318, guid: c42378f5c592d2e419febb47325d501f, type: 3} + - {fileID: -2820677304421627773, guid: c42378f5c592d2e419febb47325d501f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.84999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + 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/Art/Animations/UI/ThoughtBubble/ThoughtBubbleSmall.anim.meta b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleSmall.anim.meta new file mode 100644 index 00000000..1748474a --- /dev/null +++ b/Assets/Art/Animations/UI/ThoughtBubble/ThoughtBubbleSmall.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1cc3ee403007f0b4f9e5277462b07e85 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Back_WalkIdle.png.meta b/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Back_WalkIdle.png.meta index c8b29c89..c71ba491 100644 --- a/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Back_WalkIdle.png.meta +++ b/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Back_WalkIdle.png.meta @@ -151,6 +151,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -163,7 +189,7 @@ TextureImporter: width: 289 height: 401 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -185,7 +211,7 @@ TextureImporter: width: 289 height: 401 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -207,7 +233,7 @@ TextureImporter: width: 289 height: 398 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -229,7 +255,7 @@ TextureImporter: width: 289 height: 398 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -251,7 +277,7 @@ TextureImporter: width: 288 height: 391 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -273,7 +299,7 @@ TextureImporter: width: 288 height: 380 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -295,7 +321,7 @@ TextureImporter: width: 288 height: 380 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -317,7 +343,7 @@ TextureImporter: width: 288 height: 380 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -339,7 +365,7 @@ TextureImporter: width: 288 height: 380 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -361,7 +387,7 @@ TextureImporter: width: 286 height: 374 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -383,7 +409,7 @@ TextureImporter: width: 286 height: 374 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -405,7 +431,7 @@ TextureImporter: width: 286 height: 371 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -427,7 +453,7 @@ TextureImporter: width: 286 height: 371 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -449,7 +475,7 @@ TextureImporter: width: 286 height: 356 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -471,7 +497,7 @@ TextureImporter: width: 286 height: 353 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] diff --git a/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Front_WalkIdle.png.meta b/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Front_WalkIdle.png.meta index 2cf4c91b..b37abf9a 100644 --- a/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Front_WalkIdle.png.meta +++ b/Assets/Art/Sprites/Spritesheets/Characters/Pulver/Pulver_Front_WalkIdle.png.meta @@ -151,6 +151,32 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: iOS + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -163,7 +189,7 @@ TextureImporter: width: 286 height: 401 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -185,7 +211,7 @@ TextureImporter: width: 286 height: 401 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -207,7 +233,7 @@ TextureImporter: width: 288 height: 391 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -229,7 +255,7 @@ TextureImporter: width: 289 height: 372 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -251,7 +277,7 @@ TextureImporter: width: 289 height: 372 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -273,7 +299,7 @@ TextureImporter: width: 289 height: 372 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -295,7 +321,7 @@ TextureImporter: width: 289 height: 372 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -317,7 +343,7 @@ TextureImporter: width: 289 height: 370 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -339,7 +365,7 @@ TextureImporter: width: 289 height: 370 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -361,7 +387,7 @@ TextureImporter: width: 289 height: 370 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -378,12 +404,12 @@ TextureImporter: name: Pulver_Front_WalkIdle_07 rect: serializedVersion: 2 - x: 598 + x: 599 y: 376 width: 289 height: 370 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -405,7 +431,7 @@ TextureImporter: width: 288 height: 364 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -427,7 +453,7 @@ TextureImporter: width: 288 height: 364 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -449,7 +475,7 @@ TextureImporter: width: 288 height: 358 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -471,7 +497,7 @@ TextureImporter: width: 288 height: 358 alignment: 9 - pivot: {x: 0.5, y: 0.2} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] diff --git a/Assets/Art/Sprites/Spritesheets/UI.meta b/Assets/Art/Sprites/Spritesheets/UI.meta new file mode 100644 index 00000000..7b36ba36 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a9adf5eeaab3ca43b5551c6c8c586ba +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Sprites/Spritesheets/UI/ThoughtBubbleBMS.png b/Assets/Art/Sprites/Spritesheets/UI/ThoughtBubbleBMS.png new file mode 100644 index 00000000..22d99c8c Binary files /dev/null and b/Assets/Art/Sprites/Spritesheets/UI/ThoughtBubbleBMS.png differ diff --git a/Assets/Art/Sprites/Spritesheets/UI/ThoughtBubbleBMS.png.meta b/Assets/Art/Sprites/Spritesheets/UI/ThoughtBubbleBMS.png.meta new file mode 100644 index 00000000..2f226957 --- /dev/null +++ b/Assets/Art/Sprites/Spritesheets/UI/ThoughtBubbleBMS.png.meta @@ -0,0 +1,480 @@ +fileFormatVersion: 2 +guid: c42378f5c592d2e419febb47325d501f +TextureImporter: + internalIDToNameTable: + - first: + 213: 5283048045654705310 + second: ThoughtBubbleBMS_0 + - first: + 213: -2820677304421627773 + second: ThoughtBubbleBMS_1 + - first: + 213: 8288382649714367318 + second: ThoughtBubbleBMS_2 + - first: + 213: 372642011444542933 + second: ThoughtBubbleBMS_3 + - first: + 213: -4876614219090653406 + second: ThoughtBubbleBMS_4 + - first: + 213: 546509677799411972 + second: ThoughtBubbleBMS_5 + - first: + 213: 4082558685819048054 + second: ThoughtBubbleBMS_6 + - first: + 213: 1599714215466394667 + second: ThoughtBubbleBMS_7 + - first: + 213: -5183369656504278108 + second: ThoughtBubbleBMS_8 + - first: + 213: -3929900875612406980 + second: ThoughtBubbleBMS_9 + - first: + 213: -8173383300302364078 + second: ThoughtBubbleBMS_10 + - first: + 213: -8130988047145614680 + second: ThoughtBubbleBMS_11 + - first: + 213: 1924669786497179541 + second: ThoughtBubbleBMS_12 + - first: + 213: -6669260564828371574 + second: ThoughtBubbleBMS_13 + - first: + 213: -229646397198431032 + second: ThoughtBubbleBMS_14 + - first: + 213: -7166837395581930500 + second: ThoughtBubbleBMS_15 + - first: + 213: -2302145879402119642 + second: ThoughtBubbleBMS_16 + - first: + 213: 2873474483766339749 + second: ThoughtBubbleBMS_17 + - first: + 213: -7867581550540687637 + second: ThoughtBubbleBMS_18 + - first: + 213: -579017823552334679 + second: ThoughtBubbleBMS_19 + - first: + 213: 4552783790039743924 + second: ThoughtBubbleBMS_20 + - first: + 213: -6486419153962427588 + second: ThoughtBubbleBMS_21 + - first: + 213: 1270339105808818447 + second: ThoughtBubbleBMS_22 + - first: + 213: -6468182351606206416 + second: ThoughtBubbleBMS_23 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: ThoughtBubbleBMS_0 + rect: + serializedVersion: 2 + x: 0 + y: 1425 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: e94029ce438215940800000000000000 + internalID: 5283048045654705310 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_1 + rect: + serializedVersion: 2 + x: 577 + y: 1425 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 38841fbafe0fad8d0800000000000000 + internalID: -2820677304421627773 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_2 + rect: + serializedVersion: 2 + x: 1150 + y: 1425 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 65b5cbe2b10460370800000000000000 + internalID: 8288382649714367318 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_3 + rect: + serializedVersion: 2 + x: 0 + y: 950 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 5ddf9806fe3eb2500800000000000000 + internalID: 372642011444542933 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_4 + rect: + serializedVersion: 2 + x: 575 + y: 950 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 22f8b748439c25cb0800000000000000 + internalID: -4876614219090653406 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_5 + rect: + serializedVersion: 2 + x: 1150 + y: 950 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4011c8b08a7959700800000000000000 + internalID: 546509677799411972 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_6 + rect: + serializedVersion: 2 + x: 0 + y: 475 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 6701ee29e7928a830800000000000000 + internalID: 4082558685819048054 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_7 + rect: + serializedVersion: 2 + x: 575 + y: 475 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: b2464037a93533610800000000000000 + internalID: 1599714215466394667 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_8 + rect: + serializedVersion: 2 + x: 1150 + y: 475 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 4a3268492c8f018b0800000000000000 + internalID: -5183369656504278108 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_9 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: c3b30a2a9ff2679c0800000000000000 + internalID: -3929900875612406980 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_10 + rect: + serializedVersion: 2 + x: 575 + y: 0 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2522e5c513f429e80800000000000000 + internalID: -8173383300302364078 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: ThoughtBubbleBMS_11 + rect: + serializedVersion: 2 + x: 1150 + y: 0 + width: 575 + height: 475 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 8a240f0737de82f80800000000000000 + internalID: -8130988047145614680 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 27c7b539120a8d842ae2369d27d4944f + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: + - key: SpriteEditor.SliceSettings + value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":575.0,"y":475.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.5},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":0,"pivotUnitMode":0,"slicingType":1,"keepEmptyRects":false,"isAlternate":false}' + nameFileIdTable: + ThoughtBubbleBMS_0: 5283048045654705310 + ThoughtBubbleBMS_1: -2820677304421627773 + ThoughtBubbleBMS_10: -8173383300302364078 + ThoughtBubbleBMS_11: -8130988047145614680 + ThoughtBubbleBMS_2: 8288382649714367318 + ThoughtBubbleBMS_3: 372642011444542933 + ThoughtBubbleBMS_4: -4876614219090653406 + ThoughtBubbleBMS_5: 546509677799411972 + ThoughtBubbleBMS_6: 4082558685819048054 + ThoughtBubbleBMS_7: 1599714215466394667 + ThoughtBubbleBMS_8: -5183369656504278108 + ThoughtBubbleBMS_9: -3929900875612406980 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index d65bf65d..3b246c4b 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 @@ -1281,22 +1371,24 @@ PolygonCollider2D: - {x: 89.69604, y: -23.252583} - {x: 85.70714, y: -82.23322} - {x: 69.60939, y: -82.269455} - - {x: 74.01433, y: -62.149834} - - {x: 67.98012, y: -62.438797} - - {x: 59.66469, y: -61.76319} - - {x: 44.051353, y: -63.377674} - - {x: 33.09439, y: -63.122875} - - {x: 25.451967, y: -61.529755} - - {x: 22.896826, y: -59.966286} + - {x: 74.609085, y: -62.328262} + - {x: 68.812775, y: -62.914604} + - {x: 59.54573, y: -62.179523} + - {x: 44.348732, y: -63.675056} + - {x: 33.3323, y: -63.658165} + - {x: 25.451967, y: -62.30294} + - {x: 23.007975, y: -61.092964} + - {x: 22.480497, y: -59.549957} - {x: 27.441515, y: -57.01676} - - {x: 27.030504, y: -55.91338} - - {x: 16.026094, y: -57.697495} - - {x: 8.161266, y: -57.111847} - - {x: 5.0998783, y: -53.833015} - - {x: 6.146944, y: -51.120068} - - {x: 10.898872, y: -50.721626} - - {x: 12.013062, y: -48.1396} - - {x: 7.711693, y: -47.26676} + - {x: 26.554697, y: -56.151283} + - {x: 16.204523, y: -58.054348} + - {x: 11.022343, y: -58.320366} + - {x: 6.139084, y: -56.933414} + - {x: 4.3861694, y: -54.665676} + - {x: 5.016903, y: -50.882164} + - {x: 11.077297, y: -49.115776} + - {x: 10.764069, y: -47.78274} + - {x: 6.1058426, y: -46.31515} - {x: 8.516571, y: -43.74309} - {x: 5.7218037, y: -42.103886} - {x: 1.0456238, y: -39.36118} @@ -1595,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 @@ -429906,11 +430122,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} propertyPath: m_LocalPosition.x - value: -0.3 + value: 2.81 objectReference: {fileID: 0} - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} propertyPath: m_LocalPosition.y - value: -2.4 + value: 3.98 objectReference: {fileID: 0} - target: {fileID: 3823830588451517910, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} propertyPath: m_LocalPosition.z @@ -431775,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: @@ -434778,21 +434994,134 @@ Transform: m_CorrespondingSourceObject: {fileID: 9067462609398217044, guid: 6cbcaf4eb20e63e4fb462f6fb1ada3a7, type: 3} m_PrefabInstance: {fileID: 514383803} m_PrefabAsset: {fileID: 0} +--- !u!1 &515824553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 515824556} + - component: {fileID: 515824555} + - component: {fileID: 515824554} + m_Layer: 0 + m_Name: ThoughtBubbleExample + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &515824554 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515824553} + 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: -1132846201 + m_SortingLayer: 1 + m_SortingOrder: 5 + m_Sprite: {fileID: -5183369656504278108, guid: c42378f5c592d2e419febb47325d501f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.75, y: 4.75} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &515824555 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515824553} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 4e0f7b1ec0f2a1140bbf9539024ace40, 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!4 &515824556 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 515824553} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 36.3, y: 15.32, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &520186664 PrefabInstance: m_ObjectHideFlags: 0 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: 64.02 + value: -6.784 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.y - value: 33.47 + value: -2.901 objectReference: {fileID: 0} - target: {fileID: 3984039030829909690, guid: b3fc964bec385174f85a143f2fcff121, type: 3} propertyPath: m_LocalPosition.z @@ -434804,15 +435133,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 @@ -434826,6 +435155,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 @@ -434839,6 +435196,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} @@ -435231,7 +435593,8 @@ GameObject: m_Component: - component: {fileID: 552754830} - component: {fileID: 552754831} - m_Layer: 0 + - component: {fileID: 552754832} + m_Layer: 6 m_Name: Sign m_TagString: Untagged m_Icon: {fileID: 0} @@ -435246,12 +435609,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 552754829} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.856, y: -0.618, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -27.55, y: 51.64, z: 0} + m_LocalScale: {x: 4.8086, y: 4.8086, z: 4.8086} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1923065564} + m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &552754831 SpriteRenderer: @@ -435310,7 +435673,58 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_SpriteSortPoint: 1 +--- !u!60 &552754832 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 552754829} + 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.2} + oldSize: {x: 1.32, y: 1.15} + newSize: {x: 1.32, y: 1.15} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -0.64769787, y: 0.056594986} + - {x: 0.57684666, y: 0.06930435} + - {x: 0.58312255, y: 0.42421705} + - {x: -0.38253227, y: 0.42578614} + m_UseDelaunayMesh: 0 --- !u!1001 &561092052 PrefabInstance: m_ObjectHideFlags: 0 @@ -437126,6 +437540,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 @@ -437524,7 +438028,6 @@ GameObject: m_Component: - component: {fileID: 719063943} - component: {fileID: 719063942} - - component: {fileID: 719063941} m_Layer: 0 m_Name: PicnicPPl m_TagString: Untagged @@ -437532,28 +438035,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 @@ -437620,12 +438101,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: @@ -439160,6 +439641,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 @@ -443157,6 +443815,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 @@ -443228,7 +443976,7 @@ Transform: m_GameObject: {fileID: 1137411209} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.3, y: -2.4, z: -10} + m_LocalPosition: {x: 2.81, y: 3.98, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -444659,6 +445407,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 @@ -449514,12 +450310,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: @@ -449866,7 +450662,7 @@ Transform: m_GameObject: {fileID: 1653475490} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.3, y: -2.4, z: -10} + m_LocalPosition: {x: 2.81, y: 3.98, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -453906,8 +454702,7 @@ Transform: m_LocalPosition: {x: -84.21, y: 75.91, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 552754830} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1926702336 stripped @@ -454108,6 +454903,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 @@ -456530,11 +457373,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 @@ -457405,6 +458248,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 5953355976663919699, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6165893904866732969, guid: df01157608cce6447b7ccde0bfa290e1, type: 3} propertyPath: m_Size.y value: 3.82 @@ -457415,15 +458262,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 @@ -458128,6 +458975,10 @@ PrefabInstance: propertyPath: m_Name value: BallTree objectReference: {fileID: 0} + - target: {fileID: 8897661028274890141, guid: c36b48a324dcaef4cb5ee0f8ca57f0d6, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -458515,17 +459366,16 @@ SceneRoots: - {fileID: 1923065564} - {fileID: 368957768} - {fileID: 487455852} + - {fileID: 552754830} - {fileID: 322941695315393326} - {fileID: 1373293420} - {fileID: 1032520927} - {fileID: 1295249126} - - {fileID: 520186664} - {fileID: 1328912324} - {fileID: 2117822310} - {fileID: 122256018} - {fileID: 1101333109} - {fileID: 4912039252317080710} - {fileID: 12163667} - - {fileID: 719063943} - - {fileID: 1631506257} - - {fileID: 317149914} + - {fileID: 143210813} + - {fileID: 515824556} 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