diff --git a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdFlight.anim b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdFlight.anim index 4d1bacb0..a221ac60 100644 --- a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdFlight.anim +++ b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdFlight.anim @@ -50,12 +50,6 @@ AnimationClip: value: {fileID: 7381092181848048596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - time: 1.2333333 value: {fileID: -3846425930340267890, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 1.3333334 - value: {fileID: -789941811845186552, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 1.4 - value: {fileID: 829168875843345714, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - time: 1.5 - value: {fileID: -5202983862763460179, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} attribute: m_Sprite path: classID: 212 @@ -93,15 +87,12 @@ AnimationClip: - {fileID: -1408805331151090596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - {fileID: 7381092181848048596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - {fileID: -3846425930340267890, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -789941811845186552, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: 829168875843345714, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - - {fileID: -5202983862763460179, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.5166667 + m_StopTime: 1.25 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim index 2b94ef14..82b0a9ea 100644 --- a/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim +++ b/Assets/Art/Animations/Characters/Birds/FootballBird/footballBirdIdle.anim @@ -21,65 +21,35 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - 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.25 - value: {fileID: -3809834153560938047, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + 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} - time: 0.28333333 - value: {fileID: 7797799588708644691, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.31666666 - value: {fileID: -3694855373773427773, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + value: {fileID: -6166410269971174550, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - time: 0.35 - value: {fileID: -772774839854160401, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.4 - value: {fileID: 2775065027350882613, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + value: {fileID: -697087381347587415, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - time: 0.43333334 - 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} + value: {fileID: -8526899043302120773, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + - time: 0.5 + value: {fileID: -2697202594669319986, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - time: 0.56666666 - value: {fileID: 3490090362724945448, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.6 - value: {fileID: 4386831219829939925, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + value: {fileID: 1537021138919000452, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - time: 0.65 - value: {fileID: -6530143234255615529, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.68333334 - value: {fileID: 7096009967814692052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.73333335 - value: {fileID: 6319826433179223563, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.76666665 - value: {fileID: -5952344288683761052, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.81666666 - value: {fileID: -7201094444470444464, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + value: {fileID: -441064275176934823, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + - time: 0.71666664 + value: {fileID: -3513104290579005075, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + - time: 0.78333336 + value: {fileID: -3332844303632730036, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - time: 0.85 - value: {fileID: 2104556673111889494, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.8833333 - value: {fileID: -3089917731664936424, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.9166667 - value: {fileID: 8331946793720757423, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} - - time: 0.96666664 - value: {fileID: -3625782473088726632, guid: c0e435e6bd128d045929db855ffe1dfa, type: 3} + value: {fileID: -1408805331151090596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} + - time: 0.93333334 + value: {fileID: 7381092181848048596, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} - time: 1 - 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} + value: {fileID: -3846425930340267890, guid: 93b9ffd6c816a294c9c184ec6c0e8a11, type: 3} attribute: m_Sprite path: classID: 212 @@ -102,42 +72,27 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {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} + - {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} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.1833333 + m_StopTime: 1.0166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim b/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim new file mode 100644 index 00000000..2fc490da --- /dev/null +++ b/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim @@ -0,0 +1,243 @@ +%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: LongAnimPicnicPPLShoo + 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: -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 + 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.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 + 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: 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 + 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.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: + 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: -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} + - {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: 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} + - {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: 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} + - {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: 4086135313560770538, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + - {fileID: 8284415363918423251, guid: 6801cb749018fc14eb534cd4d85a572f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.2666667 + 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/Resources/PerformanceTestRunInfo.json.meta b/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim.meta similarity index 52% rename from Assets/Resources/PerformanceTestRunInfo.json.meta rename to Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim.meta index d64dd08e..c9343714 100644 --- a/Assets/Resources/PerformanceTestRunInfo.json.meta +++ b/Assets/Art/Animations/Characters/PicnicPPL/LongAnimPicnicPPLShoo.anim.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 30eed45b70c64f149a8c41413586dc59 -TextScriptImporter: +guid: 8b4539a2ef3c97749a0055613875a07d +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller b/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller index 9ebbe0a5..c9d86f0c 100644 --- a/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller +++ b/Assets/Art/Animations/Characters/PicnicPPL/PicnicPPL_Animator.controller @@ -67,6 +67,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -7558122856987167529} m_Position: {x: 30, y: 370, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1286523504048593293} + m_Position: {x: 390, y: 370, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -189,6 +192,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &1286523504048593293 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: LongAnimPicnicPPLShoo + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + 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: 8b4539a2ef3c97749a0055613875a07d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &3087410442764859200 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller b/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller index fbcd7cdf..25c7bf3b 100644 --- a/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller +++ b/Assets/Art/Animations/Characters/Pulver/PulverCharacter.controller @@ -168,6 +168,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -2890685227036579189} + - {fileID: 2935079620590939614} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -219,13 +220,13 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -1562887171840619689} - m_Position: {x: 40, y: 360, z: 0} + m_Position: {x: 30, y: 360, z: 0} - serializedVersion: 1 m_State: {fileID: -6908324641349580049} m_Position: {x: 30, y: 230, z: 0} - serializedVersion: 1 m_State: {fileID: 6806729379030734002} - m_Position: {x: 65, y: 295, z: 0} + m_Position: {x: 30, y: 290, z: 0} - serializedVersion: 1 m_State: {fileID: -3761661305846931001} m_Position: {x: 420, y: 190, z: 0} @@ -240,13 +241,13 @@ AnimatorStateMachine: m_Position: {x: 420, y: 340, z: 0} - serializedVersion: 1 m_State: {fileID: 3364220882969471902} - m_Position: {x: 455, y: 405, z: 0} + m_Position: {x: 420, y: 390, z: 0} - serializedVersion: 1 m_State: {fileID: 5882640659329534007} - m_Position: {x: 490, y: 470, z: 0} + m_Position: {x: 420, y: 440, z: 0} - serializedVersion: 1 m_State: {fileID: -2247811965598142207} - m_Position: {x: 525, y: 535, z: 0} + m_Position: {x: -200, y: 500, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -272,6 +273,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 9100000} + - m_Name: cucumbAttacc + m_Type: 9 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -285,6 +292,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &2935079620590939614 +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: cucumbAttacc + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -2247811965598142207} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &3364220882969471902 AnimatorState: serializedVersion: 6 diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Back.anim b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Back.anim index 58b0203b..5bd18663 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Back.anim +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Back.anim @@ -21,7 +21,7 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -319842924608091415, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: 845438974, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} attribute: m_Sprite path: classID: 212 @@ -44,7 +44,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -319842924608091415, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 845438974, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Front.anim b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Front.anim index 0914adae..a0a1d17d 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Front.anim +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Idle_Front.anim @@ -21,7 +21,7 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 781975875284984149, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -505642681, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} attribute: m_Sprite path: classID: 212 @@ -44,7 +44,7 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 781975875284984149, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -505642681, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} diff --git a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Back.anim b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Back.anim index 55da6227..f1a8c0e3 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Back.anim +++ b/Assets/Art/Animations/Characters/Trafalgar/Trafalgar_Walk_Back.anim @@ -21,37 +21,39 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: -3316296481537724497, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -556832147, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.033333335 - value: {fileID: 5275231501427050266, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -616274331, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.06666667 - value: {fileID: 5065588397958997725, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: 1888612073, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.1 - value: {fileID: -1799821733057083135, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -212446684, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.13333334 - value: {fileID: 3359278872884668669, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: 350403136, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.16666667 - value: {fileID: 4873778977253756264, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -1828339421, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.2 - value: {fileID: 5474132021306434435, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: 1559732485, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.23333333 - value: {fileID: 5657335179516396923, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -1779089331, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.26666668 - value: {fileID: 7068305896229948144, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -1712809396, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.3 - value: {fileID: -5050755803148161400, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -240391413, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.33333334 - value: {fileID: 4713247550292684394, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -679746830, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.36666667 - value: {fileID: 8004208492819434840, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: 612622857, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.4 - value: {fileID: -5696299307373555239, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -630125210, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.43333334 - value: {fileID: 1156791575129602627, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: 176563225, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.46666667 - value: {fileID: 4761273037836205496, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: -768309105, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - time: 0.5 - value: {fileID: -677759241461689189, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + value: {fileID: 1890896345, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - time: 0.53333336 + value: {fileID: 845438974, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} attribute: m_Sprite path: classID: 212 @@ -74,28 +76,29 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: -3316296481537724497, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 5275231501427050266, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 5065588397958997725, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: -1799821733057083135, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 3359278872884668669, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 4873778977253756264, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 5474132021306434435, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 5657335179516396923, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 7068305896229948144, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: -5050755803148161400, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 4713247550292684394, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 8004208492819434840, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: -5696299307373555239, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 1156791575129602627, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: 4761273037836205496, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} - - {fileID: -677759241461689189, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -556832147, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -616274331, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 1888612073, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -212446684, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 350403136, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -1828339421, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 1559732485, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -1779089331, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -1712809396, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -240391413, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -679746830, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 612622857, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -630125210, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 176563225, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: -768309105, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 1890896345, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} + - {fileID: 845438974, guid: dffba0ce39ba57e41b4bf74be3afce7a, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.53333336 + m_StopTime: 0.5666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller b/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller index fb473739..d03598ba 100644 --- a/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller +++ b/Assets/Art/Animations/Characters/Trafalgar/trafalgar_0002.controller @@ -226,16 +226,16 @@ AnimatorStateMachine: m_Position: {x: 30, y: 220, z: 0} - serializedVersion: 1 m_State: {fileID: 1610360039336346648} - m_Position: {x: 460, y: 250, z: 0} + m_Position: {x: 370, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: 4768840196775414213} - m_Position: {x: 460, y: 350, z: 0} + m_Position: {x: 370, y: 310, z: 0} - serializedVersion: 1 m_State: {fileID: -7905659897279314362} - m_Position: {x: 495, y: 415, z: 0} + m_Position: {x: 370, y: 360, z: 0} - serializedVersion: 1 m_State: {fileID: 3675985781614168062} - m_Position: {x: 530, y: 480, z: 0} + m_Position: {x: 370, y: 410, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Art/Animations/Characters/Wolter/wolter_Jump.anim b/Assets/Art/Animations/Characters/Wolter/wolter_Jump.anim index 043ee50c..084db9d8 100644 --- a/Assets/Art/Animations/Characters/Wolter/wolter_Jump.anim +++ b/Assets/Art/Animations/Characters/Wolter/wolter_Jump.anim @@ -21,27 +21,27 @@ AnimationClip: - serializedVersion: 2 curve: - time: 0 - value: {fileID: 1547339118, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.05 - value: {fileID: -1908743190, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.1 - value: {fileID: -1557471863, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.15 - value: {fileID: -53376854, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.2 - value: {fileID: -20110242, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + value: {fileID: 1027233118, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.083333336 + value: {fileID: -1499519980, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.16666667 + value: {fileID: 1163924069, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - time: 0.25 - value: {fileID: -1269673421, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.3 - value: {fileID: 935682700, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.35 - value: {fileID: 1760669646, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.4 - value: {fileID: -546741635, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - time: 0.45 - value: {fileID: 311806820, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + value: {fileID: 1155449657, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.33333334 + value: {fileID: 1838604763, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.41666666 + value: {fileID: -1345295882, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - time: 0.5 - value: {fileID: 1323277058, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + value: {fileID: 1767484529, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.5833333 + value: {fileID: 1406031069, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.6666667 + value: {fileID: 1687200477, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.75 + value: {fileID: 1551596162, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - time: 0.8333333 + value: {fileID: 479623201, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} attribute: m_Sprite path: classID: 212 @@ -64,23 +64,23 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 1547339118, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: -1908743190, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: -1557471863, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: -53376854, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: -20110242, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: -1269673421, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: 935682700, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: 1760669646, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: -546741635, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: 311806820, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} - - {fileID: 1323277058, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1027233118, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: -1499519980, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1163924069, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1155449657, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1838604763, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: -1345295882, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1767484529, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1406031069, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1687200477, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 1551596162, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} + - {fileID: 479623201, guid: ab4ddae652fc28246b0e0e3c3fa6a310, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.51666665 + m_StopTime: 0.84999996 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Back_IdleFrontBack.png.meta b/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Back_IdleFrontBack.png.meta index 6bf198e4..42a714f5 100644 --- a/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Back_IdleFrontBack.png.meta +++ b/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Back_IdleFrontBack.png.meta @@ -163,423 +163,471 @@ 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: - serializedVersion: 2 - name: trafalgar_Walk_Back 1_0 + name: trafalgar_Walk_Back_IdleFrontBack_0 rect: serializedVersion: 2 - x: 17 - y: 2298 - width: 364 - height: 719 - alignment: 0 - pivot: {x: 0, y: 0} + x: 0 + y: 2265 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: fafe018abe52af1d0800000000000000 - internalID: -3316296481537724497 + spriteID: 3743ce01d3cbaa54cafefea1b1e7613a + internalID: -556832147 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_1 + name: trafalgar_Walk_Back_IdleFrontBack_1 rect: serializedVersion: 2 - x: 404 - y: 2298 - width: 364 - height: 719 - alignment: 0 - pivot: {x: 0, y: 0} + x: 387 + y: 2265 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: a178286e913653940800000000000000 - internalID: 5275231501427050266 + spriteID: 335a3f7f4a96f194c8852203ab5e70f1 + internalID: -616274331 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_2 + name: trafalgar_Walk_Back_IdleFrontBack_2 rect: serializedVersion: 2 - x: 788 - y: 2280 - width: 359 - height: 732 - alignment: 0 - pivot: {x: 0, y: 0} + x: 774 + y: 2265 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: dd6afae2fc59c4640800000000000000 - internalID: 5065588397958997725 + spriteID: 8b90c54a92f5f1b439b7b151f3a749ce + internalID: 1888612073 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_3 + name: trafalgar_Walk_Back_IdleFrontBack_3 rect: serializedVersion: 2 - x: 1175 - y: 2280 - width: 359 - height: 732 - alignment: 0 - pivot: {x: 0, y: 0} + x: 1161 + y: 2265 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 109ca1e6bafb507e0800000000000000 - internalID: -1799821733057083135 + spriteID: be069b3046e503b44b0514a7bd20fed0 + internalID: -212446684 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_4 + name: trafalgar_Walk_Back_IdleFrontBack_4 rect: serializedVersion: 2 - x: 1559 - y: 2266 - width: 354 - height: 751 - alignment: 0 - pivot: {x: 0, y: 0} + x: 1548 + y: 2265 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: df8e3cf265e8e9e20800000000000000 - internalID: 3359278872884668669 + spriteID: 7954a621be04be443adfc3fd7c0c61e7 + internalID: 350403136 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_5 + name: trafalgar_Walk_Back_IdleFrontBack_5 rect: serializedVersion: 2 - x: 11 - y: 1511 - width: 354 - height: 751 - alignment: 0 - pivot: {x: 0, y: 0} + x: 0 + y: 1510 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 86d0afc482423a340800000000000000 - internalID: 4873778977253756264 + spriteID: 7cabd35c44bfce4449869a69831e7126 + internalID: -1828339421 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_6 + name: trafalgar_Walk_Back_IdleFrontBack_6 rect: serializedVersion: 2 - x: 394 - y: 1529 - width: 355 - height: 734 - alignment: 0 - pivot: {x: 0, y: 0} + x: 387 + y: 1510 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 383af87f11608fb40800000000000000 - internalID: 5474132021306434435 + spriteID: 91cbfee464029ca4f962317bd5538b64 + internalID: 1559732485 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_7 + name: trafalgar_Walk_Back_IdleFrontBack_7 rect: serializedVersion: 2 - x: 781 - y: 1529 - width: 355 - height: 734 - alignment: 0 - pivot: {x: 0, y: 0} + x: 774 + y: 1510 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: b7545663f54e28e40800000000000000 - internalID: 5657335179516396923 + spriteID: 3648e9d25ce3ea745aad0c4fe36050e7 + internalID: -1779089331 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_8 + name: trafalgar_Walk_Back_IdleFrontBack_8 rect: serializedVersion: 2 - x: 1172 - y: 1543 - width: 354 - height: 718 - alignment: 0 - pivot: {x: 0, y: 0} + x: 1161 + y: 1510 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 0fac59c53caa71260800000000000000 - internalID: 7068305896229948144 + spriteID: 5b0f8ad3e4e22144781e48238286f776 + internalID: -1712809396 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_9 + name: trafalgar_Walk_Back_IdleFrontBack_9 rect: serializedVersion: 2 - x: 1559 - y: 1543 - width: 354 - height: 718 - alignment: 0 - pivot: {x: 0, y: 0} + x: 1548 + y: 1510 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 88e6c1a6b5c18e9b0800000000000000 - internalID: -5050755803148161400 + spriteID: ce2677fed9974be4da3842b5bc75db90 + internalID: -240391413 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_10 + name: trafalgar_Walk_Back_IdleFrontBack_10 rect: serializedVersion: 2 - x: 14 - y: 770 - width: 359 - height: 732 - alignment: 0 - pivot: {x: 0, y: 0} + x: 0 + y: 755 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: a6eeca5dca1d86140800000000000000 - internalID: 4713247550292684394 + spriteID: 211639ce1063d2449ae6cf7ccfd9e9ec + internalID: -679746830 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_11 + name: trafalgar_Walk_Back_IdleFrontBack_11 rect: serializedVersion: 2 - x: 401 - y: 770 - width: 359 - height: 732 - alignment: 0 - pivot: {x: 0, y: 0} + x: 387 + y: 755 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 85dcaa25739a41f60800000000000000 - internalID: 8004208492819434840 + spriteID: 73f57e0879374a74b84753f52f06d60d + internalID: 612622857 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_12 + name: trafalgar_Walk_Back_IdleFrontBack_12 rect: serializedVersion: 2 - x: 791 - y: 756 - width: 364 - height: 751 - alignment: 0 - pivot: {x: 0, y: 0} + x: 774 + y: 755 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 9d112b1d5fda2f0b0800000000000000 - internalID: -5696299307373555239 + spriteID: 5b3a9694ef033124392b170f6b67df31 + internalID: -630125210 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_13 + name: trafalgar_Walk_Back_IdleFrontBack_13 rect: serializedVersion: 2 - x: 1178 - y: 756 - width: 364 - height: 751 - alignment: 0 - pivot: {x: 0, y: 0} + x: 1161 + y: 755 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 34ab3c20fcfbd0010800000000000000 - internalID: 1156791575129602627 + spriteID: a445ec887c5b55846ac69feb2ad57dff + internalID: 176563225 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_14 + name: trafalgar_Walk_Back_IdleFrontBack_14 rect: serializedVersion: 2 - x: 1566 - y: 774 - width: 368 - height: 734 - alignment: 0 - pivot: {x: 0, y: 0} + x: 1548 + y: 755 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 8bd3fd20a90731240800000000000000 - internalID: 4761273037836205496 + spriteID: 5737b9b48c869ac45a07f6b0fc53ef9f + internalID: -768309105 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_15 + name: trafalgar_Walk_Back_IdleFrontBack_15 rect: serializedVersion: 2 - x: 18 - y: 19 - width: 368 - height: 734 - alignment: 0 - pivot: {x: 0, y: 0} + x: 0 + y: 0 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: b9410719f8d1896f0800000000000000 - internalID: -677759241461689189 + spriteID: 04f5a49e8ee234d4da9801008b3a01c4 + internalID: 1890896345 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_16 + name: trafalgar_Walk_Back_IdleFrontBack_16 rect: serializedVersion: 2 - x: 399 - y: 11 - width: 350 - height: 742 - alignment: 0 - pivot: {x: 0, y: 0} + x: 387 + y: 0 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 9ea00defd80bf8bf0800000000000000 - internalID: -319842924608091415 + spriteID: 58027165bc7972d49be580f810d5966c + internalID: 845438974 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_17 + name: trafalgar_Walk_Back_IdleFrontBack_17 rect: serializedVersion: 2 - x: 780 - y: 202 - width: 10 - height: 12 - alignment: 0 - pivot: {x: 0, y: 0} + x: 774 + y: 0 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 7abdcff947ffa83a0800000000000000 - internalID: -6662231822375789657 + spriteID: a42674c07cfecc448b8419d12e86d565 + internalID: -505642681 vertices: [] indices: edges: [] weights: [] - serializedVersion: 2 - name: trafalgar_Walk_Back 1_18 + name: trafalgar_Walk_Back_IdleFrontBack_18 rect: serializedVersion: 2 - x: 788 - y: 11 - width: 351 - height: 713 - alignment: 0 - pivot: {x: 0, y: 0} + x: 1161 + y: 0 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] physicsShape: [] - tessellationDetail: -1 + tessellationDetail: 0 bones: [] - spriteID: 551694d5ae22ada00800000000000000 - internalID: 781975875284984149 + spriteID: 78e5af4eda82b97448a8754d8801d0d4 + internalID: -477665990 + vertices: [] + indices: + edges: [] + weights: [] + - serializedVersion: 2 + name: trafalgar_Walk_Back_IdleFrontBack_19 + rect: + serializedVersion: 2 + x: 1548 + y: 0 + width: 387 + height: 755 + alignment: 9 + pivot: {x: 0.5, y: 0.2} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: ffe9997faf6d0fb4d97e0441c9564c06 + internalID: 1042459220 vertices: [] indices: edges: [] @@ -588,7 +636,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: d5e35b26f1b488e4ba19e7928ed64470 internalID: 0 vertices: [] indices: @@ -596,27 +644,30 @@ TextureImporter: weights: [] secondaryTextures: [] spriteCustomMetadata: - entries: [] + entries: + - key: SpriteEditor.SliceSettings + value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":387.0,"y":755.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.20000000298023225},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":9,"pivotUnitMode":0,"slicingType":1,"keepEmptyRects":false,"isAlternate":false}' nameFileIdTable: - trafalgar_Walk_Back 1_0: -3316296481537724497 - trafalgar_Walk_Back 1_1: 5275231501427050266 - trafalgar_Walk_Back 1_10: 4713247550292684394 - trafalgar_Walk_Back 1_11: 8004208492819434840 - trafalgar_Walk_Back 1_12: -5696299307373555239 - trafalgar_Walk_Back 1_13: 1156791575129602627 - trafalgar_Walk_Back 1_14: 4761273037836205496 - trafalgar_Walk_Back 1_15: -677759241461689189 - trafalgar_Walk_Back 1_16: -319842924608091415 - trafalgar_Walk_Back 1_17: -6662231822375789657 - trafalgar_Walk_Back 1_18: 781975875284984149 - trafalgar_Walk_Back 1_2: 5065588397958997725 - trafalgar_Walk_Back 1_3: -1799821733057083135 - trafalgar_Walk_Back 1_4: 3359278872884668669 - trafalgar_Walk_Back 1_5: 4873778977253756264 - trafalgar_Walk_Back 1_6: 5474132021306434435 - trafalgar_Walk_Back 1_7: 5657335179516396923 - trafalgar_Walk_Back 1_8: 7068305896229948144 - trafalgar_Walk_Back 1_9: -5050755803148161400 + trafalgar_Walk_Back_IdleFrontBack_0: -556832147 + trafalgar_Walk_Back_IdleFrontBack_1: -616274331 + trafalgar_Walk_Back_IdleFrontBack_10: -679746830 + trafalgar_Walk_Back_IdleFrontBack_11: 612622857 + trafalgar_Walk_Back_IdleFrontBack_12: -630125210 + trafalgar_Walk_Back_IdleFrontBack_13: 176563225 + trafalgar_Walk_Back_IdleFrontBack_14: -768309105 + trafalgar_Walk_Back_IdleFrontBack_15: 1890896345 + trafalgar_Walk_Back_IdleFrontBack_16: 845438974 + trafalgar_Walk_Back_IdleFrontBack_17: -505642681 + trafalgar_Walk_Back_IdleFrontBack_18: -477665990 + trafalgar_Walk_Back_IdleFrontBack_19: 1042459220 + trafalgar_Walk_Back_IdleFrontBack_2: 1888612073 + trafalgar_Walk_Back_IdleFrontBack_3: -212446684 + trafalgar_Walk_Back_IdleFrontBack_4: 350403136 + trafalgar_Walk_Back_IdleFrontBack_5: -1828339421 + trafalgar_Walk_Back_IdleFrontBack_6: 1559732485 + trafalgar_Walk_Back_IdleFrontBack_7: -1779089331 + trafalgar_Walk_Back_IdleFrontBack_8: -1712809396 + trafalgar_Walk_Back_IdleFrontBack_9: -240391413 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Front.png.meta b/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Front.png.meta index d29a3644..ef0b012f 100644 --- a/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Front.png.meta +++ b/Assets/Art/Sprites/Spritesheets/Characters/Trafalgar/trafalgar_Walk_Front.png.meta @@ -170,6 +170,19 @@ TextureImporter: 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: @@ -177,12 +190,12 @@ TextureImporter: name: trafalgar_Walk_Front_0 rect: serializedVersion: 2 - x: 10 - y: 1530 - width: 358 - height: 709 + x: 0 + y: 1510 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -200,11 +213,11 @@ TextureImporter: rect: serializedVersion: 2 x: 387 - y: 1530 - width: 361 - height: 706 + y: 1510 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -221,12 +234,12 @@ TextureImporter: name: trafalgar_Walk_Front_2 rect: serializedVersion: 2 - x: 778 - y: 1513 - width: 359 - height: 721 + x: 774 + y: 1510 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -243,12 +256,12 @@ TextureImporter: name: trafalgar_Walk_Front_3 rect: serializedVersion: 2 - x: 1163 - y: 1513 - width: 361 - height: 722 + x: 1161 + y: 1510 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -265,12 +278,12 @@ TextureImporter: name: trafalgar_Walk_Front_4 rect: serializedVersion: 2 - x: 1551 - y: 1513 - width: 361 - height: 721 + x: 1548 + y: 1510 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -287,12 +300,12 @@ TextureImporter: name: trafalgar_Walk_Front_5 rect: serializedVersion: 2 - x: 1945 - y: 1524 - width: 361 - height: 707 + x: 1935 + y: 1510 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -309,12 +322,12 @@ TextureImporter: name: trafalgar_Walk_Front_6 rect: serializedVersion: 2 - x: 13 - y: 769 - width: 357 - height: 706 + x: 0 + y: 755 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -331,12 +344,12 @@ TextureImporter: name: trafalgar_Walk_Front_7 rect: serializedVersion: 2 - x: 401 - y: 789 - width: 365 - height: 689 + x: 387 + y: 755 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -353,12 +366,12 @@ TextureImporter: name: trafalgar_Walk_Front_8 rect: serializedVersion: 2 - x: 789 - y: 789 - width: 365 - height: 689 + x: 774 + y: 755 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -375,12 +388,12 @@ TextureImporter: name: trafalgar_Walk_Front_9 rect: serializedVersion: 2 - x: 1177 - y: 775 - width: 367 - height: 704 + x: 1161 + y: 755 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -397,12 +410,12 @@ TextureImporter: name: trafalgar_Walk_Front_10 rect: serializedVersion: 2 - x: 1565 - y: 778 - width: 366 - height: 705 + x: 1548 + y: 755 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -419,12 +432,12 @@ TextureImporter: name: trafalgar_Walk_Front_11 rect: serializedVersion: 2 - x: 1952 - y: 758 - width: 363 - height: 721 + x: 1935 + y: 755 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -441,12 +454,12 @@ TextureImporter: name: trafalgar_Walk_Front_12 rect: serializedVersion: 2 - x: 14 + x: 0 y: 0 - width: 367 - height: 724 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -463,12 +476,12 @@ TextureImporter: name: trafalgar_Walk_Front_13 rect: serializedVersion: 2 - x: 399 - y: 15 - width: 363 - height: 707 + x: 387 + y: 0 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -485,12 +498,12 @@ TextureImporter: name: trafalgar_Walk_Front_14 rect: serializedVersion: 2 - x: 782 - y: 13 - width: 364 - height: 709 + x: 774 + y: 0 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -507,12 +520,12 @@ TextureImporter: name: trafalgar_Walk_Front_15 rect: serializedVersion: 2 - x: 1163 - y: 37 - width: 361 - height: 691 + x: 1161 + y: 0 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -529,12 +542,12 @@ TextureImporter: name: trafalgar_Walk_Front_16 rect: serializedVersion: 2 - x: 1553 - y: 37 - width: 359 - height: 691 + x: 1548 + y: 0 + width: 387 + height: 755 alignment: 9 - pivot: {x: 0.5, y: 0.15} + pivot: {x: 0.5, y: 0.2} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -561,7 +574,7 @@ TextureImporter: spriteCustomMetadata: entries: - key: SpriteEditor.SliceSettings - value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":64.0,"y":64.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.15000000596046449},"autoSlicingMethod":0,"spriteAlignment":9,"slicingType":0,"keepEmptyRects":false,"isAlternate":false}' + value: '{"sliceOnImport":false,"gridCellCount":{"x":1.0,"y":1.0},"gridSpriteSize":{"x":387.0,"y":755.0},"gridSpriteOffset":{"x":0.0,"y":0.0},"gridSpritePadding":{"x":0.0,"y":0.0},"pivot":{"x":0.5,"y":0.20000000298023225},"pivotPixels":{"x":0.0,"y":0.0},"autoSlicingMethod":0,"spriteAlignment":9,"pivotUnitMode":0,"slicingType":1,"keepEmptyRects":false,"isAlternate":false}' nameFileIdTable: trafalgar_Walk_Front_0: 4626291922020822112 trafalgar_Walk_Front_1: -7910018044893959478 diff --git a/Assets/Resources/PerformanceTestRunInfo.json b/Assets/Resources/PerformanceTestRunInfo.json deleted file mode 100644 index e1756812..00000000 --- a/Assets/Resources/PerformanceTestRunInfo.json +++ /dev/null @@ -1 +0,0 @@ -{"TestSuite":"","Date":0,"Player":{"Development":false,"ScreenWidth":0,"ScreenHeight":0,"ScreenRefreshRate":0,"Fullscreen":false,"Vsync":0,"AntiAliasing":0,"Batchmode":false,"RenderThreadingMode":"MultiThreaded","GpuSkinning":false,"Platform":"","ColorSpace":"","AnisotropicFiltering":"","BlendWeights":"","GraphicsApi":"","ScriptingBackend":"IL2CPP","AndroidTargetSdkVersion":"AndroidApiLevelAuto","AndroidBuildSystem":"Gradle","BuildTarget":"Android","StereoRenderingPath":"MultiPass"},"Hardware":{"OperatingSystem":"","DeviceModel":"","DeviceName":"","ProcessorType":"","ProcessorCount":0,"GraphicsDeviceName":"","SystemMemorySizeMB":0},"Editor":{"Version":"6000.2.6f1","Branch":"6000.2/staging","Changeset":"cc51a95c0300","Date":1758053328},"Dependencies":["com.unity.2d.sprite@1.0.0","com.unity.2d.spriteshape@12.0.1","com.unity.addressables@2.7.3","com.unity.addressables.android@1.0.7","com.unity.cinemachine@3.1.4","com.unity.feature.2d@2.0.1","com.unity.film-internal-utilities@0.18.4-preview","com.unity.graphtoolkit@0.4.0-exp.2","com.unity.ide.rider@3.0.38","com.unity.ide.visualstudio@2.0.23","com.unity.inputsystem@1.14.2","com.unity.multiplayer.center@1.0.0","com.unity.render-pipelines.universal@17.2.0","com.unity.timeline@1.8.9","com.unity.ugui@2.0.0","com.unity.modules.accessibility@1.0.0","com.unity.modules.ai@1.0.0","com.unity.modules.androidjni@1.0.0","com.unity.modules.animation@1.0.0","com.unity.modules.assetbundle@1.0.0","com.unity.modules.audio@1.0.0","com.unity.modules.cloth@1.0.0","com.unity.modules.director@1.0.0","com.unity.modules.imageconversion@1.0.0","com.unity.modules.imgui@1.0.0","com.unity.modules.jsonserialize@1.0.0","com.unity.modules.particlesystem@1.0.0","com.unity.modules.physics@1.0.0","com.unity.modules.physics2d@1.0.0","com.unity.modules.screencapture@1.0.0","com.unity.modules.terrain@1.0.0","com.unity.modules.terrainphysics@1.0.0","com.unity.modules.tilemap@1.0.0","com.unity.modules.ui@1.0.0","com.unity.modules.uielements@1.0.0","com.unity.modules.umbra@1.0.0","com.unity.modules.unityanalytics@1.0.0","com.unity.modules.unitywebrequest@1.0.0","com.unity.modules.unitywebrequestassetbundle@1.0.0","com.unity.modules.unitywebrequestaudio@1.0.0","com.unity.modules.unitywebrequesttexture@1.0.0","com.unity.modules.unitywebrequestwww@1.0.0","com.unity.modules.vehicles@1.0.0","com.unity.modules.video@1.0.0","com.unity.modules.vr@1.0.0","com.unity.modules.wind@1.0.0","com.unity.modules.xr@1.0.0","com.unity.modules.subsystems@1.0.0","com.unity.modules.hierarchycore@1.0.0","com.unity.render-pipelines.core@17.2.0","com.unity.shadergraph@17.2.0","com.unity.render-pipelines.universal-config@17.0.3","com.unity.test-framework@1.6.0","com.unity.ext.nunit@2.0.5","com.unity.2d.animation@12.0.2","com.unity.2d.pixel-perfect@5.1.0","com.unity.2d.psdimporter@11.0.1","com.unity.2d.tilemap@1.0.0","com.unity.2d.tilemap.extras@5.0.1","com.unity.2d.aseprite@2.0.1","com.unity.splines@2.8.2","com.unity.profiling.core@1.0.2","com.unity.scriptablebuildpipeline@2.4.2","com.unity.2d.common@11.0.1","com.unity.mathematics@1.3.2","com.unity.searcher@4.9.3","com.unity.burst@1.8.24","com.unity.collections@2.5.7","com.unity.rendering.light-transport@1.0.1","com.unity.settings-manager@2.1.0","com.unity.nuget.mono-cecil@1.11.5","com.unity.test-framework.performance@3.1.0"],"Results":[]} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json b/Assets/Resources/PerformanceTestRunSettings.json deleted file mode 100644 index 49438ae1..00000000 --- a/Assets/Resources/PerformanceTestRunSettings.json +++ /dev/null @@ -1 +0,0 @@ -{"MeasurementCount":-1} \ No newline at end of file diff --git a/Assets/Resources/PerformanceTestRunSettings.json.meta b/Assets/Resources/PerformanceTestRunSettings.json.meta deleted file mode 100644 index 6cdaaf66..00000000 --- a/Assets/Resources/PerformanceTestRunSettings.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 107805368f625f14e8084b92dd89e78b -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Levels/Quarry.unity b/Assets/Scenes/Levels/Quarry.unity index 20181772..d65bf65d 100644 --- a/Assets/Scenes/Levels/Quarry.unity +++ b/Assets/Scenes/Levels/Quarry.unity @@ -911,7 +911,7 @@ MonoBehaviour: m_EditorClassIdentifier: '::' jumpSpline: {fileID: 90258306} wolterGameObject: {fileID: 2000384643} - jumpDuration: 1 + jumpDuration: 0.8 jumpDelay: 0 --- !u!1001 &94790232 PrefabInstance: @@ -255385,8 +255385,8 @@ Tilemap: - first: {x: -105, y: 34, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -264275,8 +264275,8 @@ Tilemap: - first: {x: -108, y: 38, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 4 + m_TileSpriteIndex: 4 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -264285,8 +264285,8 @@ Tilemap: - first: {x: -107, y: 38, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -270985,8 +270985,8 @@ Tilemap: - first: {x: -106, y: 41, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -273215,8 +273215,8 @@ Tilemap: - first: {x: -106, y: 42, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 4 + m_TileSpriteIndex: 4 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -295505,8 +295505,8 @@ Tilemap: - first: {x: -107, y: 52, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -299975,8 +299975,8 @@ Tilemap: - first: {x: -106, y: 54, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -311115,8 +311115,8 @@ Tilemap: - first: {x: -107, y: 59, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -326725,8 +326725,8 @@ Tilemap: - first: {x: -107, y: 66, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -335645,8 +335645,8 @@ Tilemap: - first: {x: -107, y: 70, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -338605,8 +338605,8 @@ Tilemap: - first: {x: -34, y: 71, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -341315,8 +341315,8 @@ Tilemap: - first: {x: 14, y: 72, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -342355,8 +342355,8 @@ Tilemap: - first: {x: -105, y: 73, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -343595,8 +343595,8 @@ Tilemap: - first: {x: 19, y: 73, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -343615,8 +343615,8 @@ Tilemap: - first: {x: 21, y: 73, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -345895,8 +345895,8 @@ Tilemap: - first: {x: 26, y: 74, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -350325,8 +350325,8 @@ Tilemap: - first: {x: 23, y: 76, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -352515,8 +352515,8 @@ Tilemap: - first: {x: 19, y: 77, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -356505,8 +356505,8 @@ Tilemap: - first: {x: -28, y: 79, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -356965,8 +356965,8 @@ Tilemap: - first: {x: 18, y: 79, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -361445,8 +361445,8 @@ Tilemap: - first: {x: 20, y: 81, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -361485,8 +361485,8 @@ Tilemap: - first: {x: 24, y: 81, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -362405,8 +362405,8 @@ Tilemap: - first: {x: -107, y: 82, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -363615,8 +363615,8 @@ Tilemap: - first: {x: 14, y: 82, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -363645,8 +363645,8 @@ Tilemap: - first: {x: 17, y: 82, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -367635,8 +367635,8 @@ Tilemap: - first: {x: -30, y: 84, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -368125,8 +368125,8 @@ Tilemap: - first: {x: 19, y: 84, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -373565,8 +373565,8 @@ Tilemap: - first: {x: -106, y: 87, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -377025,8 +377025,8 @@ Tilemap: - first: {x: 17, y: 88, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -381515,8 +381515,8 @@ Tilemap: - first: {x: 20, y: 90, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -383105,8 +383105,8 @@ Tilemap: - first: {x: -44, y: 91, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -383265,8 +383265,8 @@ Tilemap: - first: {x: -28, y: 91, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -385435,8 +385435,8 @@ Tilemap: - first: {x: -34, y: 92, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -385945,8 +385945,8 @@ Tilemap: - first: {x: 17, y: 92, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -387615,8 +387615,8 @@ Tilemap: - first: {x: -39, y: 93, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -388225,8 +388225,8 @@ Tilemap: - first: {x: 22, y: 93, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -391395,8 +391395,8 @@ Tilemap: - first: {x: -107, y: 95, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -397085,8 +397085,8 @@ Tilemap: - first: {x: 16, y: 97, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -397115,8 +397115,8 @@ Tilemap: - first: {x: 19, y: 97, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -399215,8 +399215,8 @@ Tilemap: - first: {x: 6, y: 98, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -406045,8 +406045,8 @@ Tilemap: - first: {x: 20, y: 101, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -408305,8 +408305,8 @@ Tilemap: - first: {x: 23, y: 102, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -410455,8 +410455,8 @@ Tilemap: - first: {x: 15, y: 103, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -412595,8 +412595,8 @@ Tilemap: - first: {x: 6, y: 104, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -413705,8 +413705,8 @@ Tilemap: - first: {x: -106, y: 105, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -414945,8 +414945,8 @@ Tilemap: - first: {x: 18, y: 105, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -420385,8 +420385,8 @@ Tilemap: - first: {x: -107, y: 108, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -421705,8 +421705,8 @@ Tilemap: - first: {x: 25, y: 108, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 5 + m_TileSpriteIndex: 5 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -423845,8 +423845,8 @@ Tilemap: - first: {x: 16, y: 109, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -423885,8 +423885,8 @@ Tilemap: - first: {x: 20, y: 109, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -429174,17 +429174,17 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 41827 + - m_RefCount: 41777 m_Data: {fileID: 11400000, guid: 947eb38d48ece064da924975bea695ff, type: 2} - m_RefCount: 275 m_Data: {fileID: 11400000, guid: 07d871749103c144ea29788f769b5513, type: 2} - - m_RefCount: 159 + - m_RefCount: 183 m_Data: {fileID: 11400000, guid: a06e342419b153042a9bd4bb2c521fd1, type: 2} - m_RefCount: 195 m_Data: {fileID: 11400000, guid: 28f3f46a9f9bc4641aafb261bb9c68b2, type: 2} - - m_RefCount: 68 + - m_RefCount: 70 m_Data: {fileID: 11400000, guid: 2a22e670f9226d0498e7e4554244ae63, type: 2} - - m_RefCount: 50 + - m_RefCount: 74 m_Data: {fileID: 11400000, guid: 64ada481887766540aa733572f564673, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 76c0cae0379d36e4bad3585e0bf58b0b, type: 2} @@ -429195,17 +429195,17 @@ Tilemap: - m_RefCount: 6 m_Data: {fileID: 11400000, guid: 3e3ac7c238ffe1d41993e74d8d81b9dd, type: 2} m_TileSpriteArray: - - m_RefCount: 41827 + - m_RefCount: 41777 m_Data: {fileID: -1391011626, guid: 7146f6cf601588646afbc46121dc5306, type: 3} - m_RefCount: 275 m_Data: {fileID: -58245721, guid: 7146f6cf601588646afbc46121dc5306, type: 3} - - m_RefCount: 159 + - m_RefCount: 183 m_Data: {fileID: -52983998, guid: 7146f6cf601588646afbc46121dc5306, type: 3} - m_RefCount: 195 m_Data: {fileID: -1553248362, guid: 7146f6cf601588646afbc46121dc5306, type: 3} - - m_RefCount: 68 + - m_RefCount: 70 m_Data: {fileID: -891416844, guid: 7146f6cf601588646afbc46121dc5306, type: 3} - - m_RefCount: 50 + - m_RefCount: 74 m_Data: {fileID: 2128616237, guid: 7146f6cf601588646afbc46121dc5306, type: 3} - m_RefCount: 1 m_Data: {fileID: -1024556365, guid: 7146f6cf601588646afbc46121dc5306, type: 3} @@ -429309,10 +429309,11 @@ PolygonCollider2D: m_Paths: - - {x: 55.911503, y: 66.66405} - {x: 32.48283, y: 63.348362} - - {x: 15.189455, y: 69.19299} - - {x: 15.087139, y: 111.767746} - - {x: -103.92067, y: 112.0555} - - {x: -103.79294, y: 36.64344} + - {x: 21.95152, y: 69.357925} + - {x: 21.519344, y: 111.93268} + - {x: -107.87895, y: 112.0555} + - {x: -106.92658, y: 36.64344} + - {x: -93.7438, y: 19.647833} - {x: -74.547615, y: -57.51284} - {x: 91.60302, y: -63.161953} - {x: 87.38972, y: 66.09816} @@ -429879,6 +429880,14 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 953548474423422888, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} + propertyPath: m_Size.x + value: 3.8700001 + objectReference: {fileID: 0} + - target: {fileID: 953548474423422888, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} + propertyPath: m_Size.y + value: 7.55122 + objectReference: {fileID: 0} - target: {fileID: 953548474423422888, guid: 301b4e0735896334f8f6fb9a68a7e419, type: 3} propertyPath: m_SortingOrder value: 1 @@ -440105,6 +440114,9 @@ Transform: - {fileID: 1009527917} - {fileID: 1634826} - {fileID: 1896936921} + - {fileID: 1700499947} + - {fileID: 1042636115} + - {fileID: 1189154056} - {fileID: 1019773519} m_Father: {fileID: 764788851} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -441374,6 +441386,80 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 93ab59741ddc4e045a61cd8e05b65578, type: 3} +--- !u!1001 &1042636114 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 965792696} + m_Modifications: + - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_Name + value: TreeSingle (137) + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.x + value: 16.72 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.y + value: 54.97 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayerID + value: 622133659 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!4 &1042636115 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1042636114} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1044802807 PrefabInstance: m_ObjectHideFlags: 0 @@ -443892,6 +443978,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1188930586} m_Mesh: {fileID: 4300000, guid: eae229cde7c374059a09c8052360682c, type: 3} +--- !u!1001 &1189154055 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 965792696} + m_Modifications: + - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_Name + value: TreeSingle (138) + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.x + value: 20.97 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.y + value: 41.62 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayerID + value: 622133659 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!4 &1189154056 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1189154055} + m_PrefabAsset: {fileID: 0} --- !u!1 &1190559318 GameObject: m_ObjectHideFlags: 0 @@ -450698,6 +450858,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1697655756} m_Mesh: {fileID: 4300000, guid: eae229cde7c374059a09c8052360682c, type: 3} +--- !u!1001 &1700499946 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 965792696} + m_Modifications: + - target: {fileID: 5058917437625693172, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_Name + value: TreeSingle (136) + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.x + value: 16.57 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.y + value: 31.81 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayer + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 5662903716784000024, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + propertyPath: m_SortingLayerID + value: 622133659 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} +--- !u!4 &1700499947 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5145306031820616614, guid: fbbe1f4baf226904b96f839fe0c00181, type: 3} + m_PrefabInstance: {fileID: 1700499946} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1704723656 PrefabInstance: m_ObjectHideFlags: 0