diff --git a/Assets/Resources/Games/doubleDate.prefab b/Assets/Resources/Games/doubleDate.prefab index 295688c2c..d032027fa 100644 --- a/Assets/Resources/Games/doubleDate.prefab +++ b/Assets/Resources/Games/doubleDate.prefab @@ -24,13 +24,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 43600556732259202} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.0773306, y: 0.87604374, z: -51.962547} + m_LocalPosition: {x: 2.7875454, y: 0.89283216, z: -88.225716} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6298331952399505036} - {fileID: 4626858940614630841} - {fileID: 2174829105558405914} - m_Father: {fileID: 7201125439649252432} + m_Father: {fileID: 5813499711186931250} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &57695521606597285 @@ -57,48 +57,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 57695521606597285} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.2897851, y: -0.01678843, z: 36.26317} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 9047458390444353300} - m_Father: {fileID: 7201125439649252432} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &59002793414838372 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7201125439649252432} - m_Layer: 0 - m_Name: TEMPEVERYTHING - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7201125439649252432 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 59002793414838372} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.2897851, y: 0.01678843, z: -36.26317} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 263501352795859555} - - {fileID: 7258283757431066233} - - {fileID: 762786529148772174} - - {fileID: 5029991124321602114} - - {fileID: 3818459665255392429} - - {fileID: 4287718705053222288} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &283193724990158647 GameObject: @@ -273,6 +237,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 762786529148772174} + - component: {fileID: 2477271591364459339} m_Layer: 0 m_Name: Boy m_TagString: Untagged @@ -288,7 +253,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 366190183088808969} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.2897851, y: -0.01678843, z: 36.26317} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5878205045299490604} @@ -298,9 +263,28 @@ Transform: - {fileID: 170696229593023098} - {fileID: 7166139784971380103} - {fileID: 1328669392204502823} - m_Father: {fileID: 7201125439649252432} + m_Father: {fileID: 5813499711186931250} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2477271591364459339 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 366190183088808969} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: bd9ad8bc09690314f8f20e65e6c69e9c, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &400084859808329842 GameObject: m_ObjectHideFlags: 0 @@ -688,7 +672,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 905986135137224291} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.2897851, y: -0.01678843, z: 36.26317} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1428595754693885985} @@ -697,7 +681,7 @@ Transform: - {fileID: 6748713912928721180} - {fileID: 6748113751559646295} - {fileID: 6947251694841818535} - m_Father: {fileID: 7201125439649252432} + m_Father: {fileID: 5813499711186931250} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &924406857522765850 @@ -724,7 +708,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 924406857522765850} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.544467, y: 1.5870078, z: 26.768925} + m_LocalPosition: {x: 3.2546818, y: 1.6037962, z: -9.494244} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4397744809321482460} @@ -732,7 +716,7 @@ Transform: - {fileID: 5850128917291469639} - {fileID: 3535969541531168374} - {fileID: 9196458193052355987} - m_Father: {fileID: 7201125439649252432} + m_Father: {fileID: 5813499711186931250} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1159938359570322293 @@ -2103,88 +2087,6 @@ Transform: m_Father: {fileID: 4397744809321482460} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &3869291244792731182 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 871315013169962156} - - component: {fileID: 8196226702839986173} - m_Layer: 0 - m_Name: DoubleDateRef - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &871315013169962156 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3869291244792731182} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.2764, y: 0.2219, z: 0} - m_LocalScale: {x: 1.8548, y: 1.8548, z: 1.8548} - m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8196226702839986173 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3869291244792731182} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: eb79fac60e4c27e4a941c01e6057abd4, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 0.5529412} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.99, y: 5.62} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &3871763257876034619 GameObject: m_ObjectHideFlags: 0 @@ -2627,88 +2529,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &4539975683882467248 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5968311425402082729} - - component: {fileID: 366559146129566900} - m_Layer: 0 - m_Name: DoubleDateRef (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &5968311425402082729 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4539975683882467248} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.2764, y: 0.2219, z: 0} - m_LocalScale: {x: 1.8548, y: 1.8548, z: 1.8548} - m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &366559146129566900 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4539975683882467248} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -20 - m_Sprite: {fileID: 21300000, guid: eb79fac60e4c27e4a941c01e6057abd4, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 9.99, y: 5.62} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &4606405373783327903 GameObject: m_ObjectHideFlags: 0 @@ -3195,11 +3015,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5125789447122880883} m_LocalRotation: {x: -0, y: -0, z: -0.10185649, w: 0.99479914} - m_LocalPosition: {x: 4.583, y: -1.98, z: 0} - m_LocalScale: {x: 0.37757042, y: 0.37757042, z: 0.3775703} + m_LocalPosition: {x: -0.90934706, y: 0.32001138, z: 11.275784} + m_LocalScale: {x: 0.37757048, y: 0.37757048, z: 0.3775703} m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 4 + m_Father: {fileID: 2602257268473603279} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -11.692} --- !u!212 &2051775677188223734 SpriteRenderer: @@ -3525,11 +3345,12 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 871315013169962156} - - {fileID: 5968311425402082729} - - {fileID: 7201125439649252432} - - {fileID: 5977261695292154059} - - {fileID: 2933939901818560754} + - {fileID: 263501352795859555} + - {fileID: 7258283757431066233} + - {fileID: 762786529148772174} + - {fileID: 5029991124321602114} + - {fileID: 3818459665255392429} + - {fileID: 4287718705053222288} - {fileID: 2602257268473603279} m_Father: {fileID: 0} m_RootOrder: 0 @@ -4842,7 +4663,7 @@ GameObject: - component: {fileID: 5977261695292154059} - component: {fileID: 30820581156807343} m_Layer: 0 - m_Name: WeaselCouple_22 + m_Name: WeaselGirlBody m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4856,11 +4677,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8963912396255787221} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 4.72, y: -3.03, z: 0} + m_LocalPosition: {x: -0.77234745, y: -0.7299886, z: 11.275784} m_LocalScale: {x: 0.38477853, y: 0.38477853, z: 0.38477853} m_Children: [] - m_Father: {fileID: 5813499711186931250} - m_RootOrder: 3 + m_Father: {fileID: 2602257268473603279} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &30820581156807343 SpriteRenderer: @@ -4937,11 +4758,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9083234075388257105} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 5.4923472, y: -2.3000114, z: -11.275784} + m_LocalPosition: {x: 5.492347, y: -2.3000114, z: -11.275784} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 2933939901818560754} + - {fileID: 5977261695292154059} m_Father: {fileID: 5813499711186931250} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9154471528831556326 GameObject: @@ -4967,12 +4790,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9154471528831556326} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.5601294, y: -3.7847795, z: -71.38717} + m_LocalPosition: {x: 1.2703443, y: -3.767991, z: -107.65034} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6280350785966093008} - {fileID: 1605197407143079897} - m_Father: {fileID: 7201125439649252432} + m_Father: {fileID: 5813499711186931250} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &9162670929510934248 diff --git a/Assets/Resources/Sfx/games/doubleDate/basketballBounce.ogg b/Assets/Resources/Sfx/games/doubleDate/basketballBounce.ogg new file mode 100644 index 000000000..ba1bbf906 Binary files /dev/null and b/Assets/Resources/Sfx/games/doubleDate/basketballBounce.ogg differ diff --git a/Assets/Resources/Sfx/games/doubleDate/football_kick.ogg.meta b/Assets/Resources/Sfx/games/doubleDate/basketballBounce.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/doubleDate/football_kick.ogg.meta rename to Assets/Resources/Sfx/games/doubleDate/basketballBounce.ogg.meta index 356249729..6765b86f0 100644 --- a/Assets/Resources/Sfx/games/doubleDate/football_kick.ogg.meta +++ b/Assets/Resources/Sfx/games/doubleDate/basketballBounce.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96c2da48ceb98c44dbf3ee8b6763542b +guid: 2c65732489ba4264fb959b27038455c4 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/doubleDate/basketball_bounce.ogg b/Assets/Resources/Sfx/games/doubleDate/basketball_bounce.ogg deleted file mode 100644 index 204fa1295..000000000 Binary files a/Assets/Resources/Sfx/games/doubleDate/basketball_bounce.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/doubleDate/footballBounce.ogg b/Assets/Resources/Sfx/games/doubleDate/footballBounce.ogg new file mode 100644 index 000000000..50ba27b4e Binary files /dev/null and b/Assets/Resources/Sfx/games/doubleDate/footballBounce.ogg differ diff --git a/Assets/Resources/Sfx/games/doubleDate/basketball_bounce.ogg.meta b/Assets/Resources/Sfx/games/doubleDate/footballBounce.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/doubleDate/basketball_bounce.ogg.meta rename to Assets/Resources/Sfx/games/doubleDate/footballBounce.ogg.meta index c281759d0..443983990 100644 --- a/Assets/Resources/Sfx/games/doubleDate/basketball_bounce.ogg.meta +++ b/Assets/Resources/Sfx/games/doubleDate/footballBounce.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9bd800a98ecb1364ab36cf8d34fd1ce6 +guid: 9c90aa9caaa11fc42a93d84dcac3211e AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/doubleDate/footballKick.ogg b/Assets/Resources/Sfx/games/doubleDate/footballKick.ogg new file mode 100644 index 000000000..d6ba882bc Binary files /dev/null and b/Assets/Resources/Sfx/games/doubleDate/footballKick.ogg differ diff --git a/Assets/Resources/Sfx/games/doubleDate/soccer_ball_bounce.ogg.meta b/Assets/Resources/Sfx/games/doubleDate/footballKick.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/doubleDate/soccer_ball_bounce.ogg.meta rename to Assets/Resources/Sfx/games/doubleDate/footballKick.ogg.meta index 75c454a8b..89d5b343a 100644 --- a/Assets/Resources/Sfx/games/doubleDate/soccer_ball_bounce.ogg.meta +++ b/Assets/Resources/Sfx/games/doubleDate/footballKick.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 14c59dd504976f84c9e9fb938e7d101e +guid: 208601a4ef7905547b31d67600cd63be AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/doubleDate/football_bounce.ogg b/Assets/Resources/Sfx/games/doubleDate/football_bounce.ogg deleted file mode 100644 index 06804d189..000000000 Binary files a/Assets/Resources/Sfx/games/doubleDate/football_bounce.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/doubleDate/football_kick.ogg b/Assets/Resources/Sfx/games/doubleDate/football_kick.ogg deleted file mode 100644 index 6eeb7fd21..000000000 Binary files a/Assets/Resources/Sfx/games/doubleDate/football_kick.ogg and /dev/null differ diff --git a/Assets/Resources/Sfx/games/doubleDate/kick.ogg b/Assets/Resources/Sfx/games/doubleDate/kick.ogg new file mode 100644 index 000000000..98fc68303 Binary files /dev/null and b/Assets/Resources/Sfx/games/doubleDate/kick.ogg differ diff --git a/Assets/Resources/Sfx/games/doubleDate/football_bounce.ogg.meta b/Assets/Resources/Sfx/games/doubleDate/kick.ogg.meta similarity index 91% rename from Assets/Resources/Sfx/games/doubleDate/football_bounce.ogg.meta rename to Assets/Resources/Sfx/games/doubleDate/kick.ogg.meta index a5835c808..ed5a833a4 100644 --- a/Assets/Resources/Sfx/games/doubleDate/football_bounce.ogg.meta +++ b/Assets/Resources/Sfx/games/doubleDate/kick.ogg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: dd409521ba02e024c9fac4ccef18e8b8 +guid: 5f0ebd7e7e9fb224cb432fa2fcf28abb AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/doubleDate/soccerBounce.ogg b/Assets/Resources/Sfx/games/doubleDate/soccerBounce.ogg new file mode 100644 index 000000000..7a9a5e239 Binary files /dev/null and b/Assets/Resources/Sfx/games/doubleDate/soccerBounce.ogg differ diff --git a/Assets/Resources/Sfx/games/doubleDate/soccerBounce.ogg.meta b/Assets/Resources/Sfx/games/doubleDate/soccerBounce.ogg.meta new file mode 100644 index 000000000..2b8a3cc74 --- /dev/null +++ b/Assets/Resources/Sfx/games/doubleDate/soccerBounce.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 42a3bb764a45550419a90f03809c41ca +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/doubleDate/soccer_ball_bounce.ogg b/Assets/Resources/Sfx/games/doubleDate/soccer_ball_bounce.ogg deleted file mode 100644 index 277fc35f7..000000000 Binary files a/Assets/Resources/Sfx/games/doubleDate/soccer_ball_bounce.ogg and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBall.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Bop.anim similarity index 82% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBall.anim rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/Bop.anim index 6618f6004..c688d4a1e 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBall.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Bop.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: SoccerBall + m_Name: Bop serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -31,7 +31,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -50,4 +50,11 @@ AnimationClip: m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: + data: + objectReferenceParameter: {fileID: -8293433933623156774, guid: 5332bfcb0761a2845b4373f67fdcd5dc, type: 3} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBall.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Bop.anim.meta similarity index 79% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBall.anim.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/Bop.anim.meta index 50b8e0499..df0f485fa 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBall.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Bop.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8b2a3425cccbc2442ba482888d5c6deb +guid: fb33469a6228a6b4fb010118930fb873 NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller new file mode 100644 index 000000000..9bf383a5c --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Boy + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1455185698795929513} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1455185698795929513 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutBag.controller.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller.meta similarity index 79% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutBag.controller.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller.meta index 53ae9cd6b..7a993c87e 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutBag.controller.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 05f0860bd346f754bb2bbd39792a6970 +guid: 03c3006bf8764c8439743f7112d3327c NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBallMain.controller b/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBallMain.controller deleted file mode 100644 index aba35b449..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBallMain.controller +++ /dev/null @@ -1,84 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-7669791086577696593 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SoccerBall - 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: 8b2a3425cccbc2442ba482888d5c6deb, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: SoccerBallMain - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 1212561139758784655} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!114 &655718185649808690 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f5298d6713af2a4aa9d4acb2fccf03a, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1107 &1212561139758784655 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -7669791086577696593} - m_Position: {x: 276.8228, y: 58.33664, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -7669791086577696593} diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags.meta deleted file mode 100644 index ad51bb6f3..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ddf02a50d2ad0d34382a926f006ce026 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/BagHolder.controller b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/BagHolder.controller deleted file mode 100644 index 3cf2fb256..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/BagHolder.controller +++ /dev/null @@ -1,101 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-7882345467483409568 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -6152196086640467136} - m_Position: {x: 200, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: -5989920305832307280} - m_Position: {x: 235, y: 65, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -6152196086640467136} ---- !u!1102 &-6152196086640467136 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Idle - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - 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: 12f2db6101574e54698365b72e490d8d, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!1102 &-5989920305832307280 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Squashing - 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: 144ac9fcce3b20e499753b20fcbefda2, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: BagHolder - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -7882345467483409568} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/BagHolder.controller.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/BagHolder.controller.meta deleted file mode 100644 index 2f3138a56..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/BagHolder.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c283d2b1e16b88459f168918e50bbeb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeIdle.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeIdle.anim deleted file mode 100644 index a0c249897..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeIdle.anim +++ /dev/null @@ -1,187 +0,0 @@ -%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: CakeIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.5, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.033333335 - value: {x: -0.5, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 1168296128566557295, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.033333335 - value: {fileID: 1168296128566557295, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - 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: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 1168296128566557295, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 1168296128566557295, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.050000004 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.5 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: -0.5 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutBag.controller b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutBag.controller deleted file mode 100644 index 5688a60d2..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutBag.controller +++ /dev/null @@ -1,124 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-5292586747444009393 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 3531555177096586416} - m_Position: {x: 260, y: 110, z: 0} - - serializedVersion: 1 - m_State: {fileID: -2407315573739182832} - m_Position: {x: 490, y: 110, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 3531555177096586416} ---- !u!1101 &-2899304119236359726 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3531555177096586416} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &-2407315573739182832 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DonutSquash - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -2899304119236359726} - 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: 3607fa67034b42e45bd21f70f3bcbec0, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DonutBag - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -5292586747444009393} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1102 &3531555177096586416 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: DonutIdle - 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: 01f833514d62dad4ab0f446cd32b2eb6, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutIdle.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutIdle.anim deleted file mode 100644 index ea5f0ee2e..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutIdle.anim +++ /dev/null @@ -1,187 +0,0 @@ -%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: DonutIdle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.55, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.033333335 - value: {x: 0.55, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -2409015282837317474, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.033333335 - value: {fileID: -2409015282837317474, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - 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: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -2409015282837317474, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -2409015282837317474, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.050000004 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.55 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0.55 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutSquash.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutSquash.anim deleted file mode 100644 index 4197a89c2..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutSquash.anim +++ /dev/null @@ -1,196 +0,0 @@ -%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: DonutSquash - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.48, y: 0.1, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: Infinity, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.11666667 - value: {x: 0.48, y: 0.07, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.21666667 - value: {x: 0.48, y: 0.07, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: - m_ScaleCurves: [] - m_FloatCurves: [] - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 226727663485625787, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.11666667 - value: {fileID: 5532583097931853015, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: - classID: 212 - script: {fileID: 0} - 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: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 0 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 226727663485625787, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 5532583097931853015, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.21666667 - 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: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.48 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0.48 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0.48 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.11666667 - value: 0.07 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutSquash.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutSquash.anim.meta deleted file mode 100644 index 89f012648..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutSquash.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: e212cd13fbf56ab44a5842a7b1127c1b -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Squashing.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Squashing.anim deleted file mode 100644 index 5ea5338f0..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Squashing.anim +++ /dev/null @@ -1,179 +0,0 @@ -%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: Squashing - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: [] - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Bags_Individual - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Bags - classID: 212 - script: {fileID: 0} - m_PPtrCurves: [] - m_SampleRate: 60 - m_WrapMode: 0 - m_Bounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} - m_ClipBindingConstant: - genericBindings: - - serializedVersion: 2 - path: 1143641605 - attribute: 2086281974 - script: {fileID: 0} - typeID: 1 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 3137090395 - attribute: 3305885265 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - pptrCurveMapping: [] - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.033333335 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Bags_Individual - classID: 1 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.033333335 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Bags - classID: 212 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Squashing.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Squashing.anim.meta deleted file mode 100644 index 209bcefa7..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Squashing.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 79774eecd28f9cb4e84c77bcae3ae3f6 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy.meta similarity index 77% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy.meta index 5598ca306..669cacab8 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 78635500dc858494c93a260c3f57c1c1 +guid: 8e00dc7024069ae43bf1fb4b2ac06e07 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeBag.controller b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller similarity index 65% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeBag.controller rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller index 0448fc34b..4003a1016 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeBag.controller +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller @@ -1,109 +1,13 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1107 &-3655407464118094101 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 3671018543181329429} - m_Position: {x: 240, y: 60, z: 0} - - serializedVersion: 1 - m_State: {fileID: -2769437509355719484} - m_Position: {x: 490, y: 60, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 3671018543181329429} ---- !u!1102 &-2769437509355719484 +--- !u!1102 &-8014542166285188035 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CakeSquash - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 2814879199843972652} - 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: 2c181c9e77810594ab59790f4dae3e13, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CakeBag - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: -3655407464118094101} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1101 &2814879199843972652 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3671018543181329429} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &3671018543181329429 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: CakeIdle + m_Name: IdleBop2 m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] @@ -116,7 +20,109 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: d9738713c25bcf44988a6f6e179addd0, type: 2} + m_Motion: {fileID: 7400000, guid: 3c54e7dfb9aaa1342943b19c869ba72b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5779869121243268710 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 388957863343072032} + m_Position: {x: 280, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: -2996248315630427433} + m_Position: {x: 300, y: 280, z: 0} + - serializedVersion: 1 + m_State: {fileID: -8014542166285188035} + m_Position: {x: 330, y: 370, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 388957863343072032} +--- !u!1102 &-2996248315630427433 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleBop + 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: 8c8e76794b4c3854fadf531d0562de8c, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Boy + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5779869121243268710} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &388957863343072032 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 0 + 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: df8bb10823e827c4398f7da486aba03b, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBallMain.controller.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller.meta similarity index 64% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBallMain.controller.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller.meta index 038bd6768..3a8cc463b 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/SoccerBallMain.controller.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Boy.controller.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 49b923a7b27d3f041beebcacf395ab9b +guid: bd9ad8bc09690314f8f20e65e6c69e9c NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Idle.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim similarity index 53% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Idle.anim rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim index 00a1fe39b..30f3bf8e4 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Idle.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim @@ -14,7 +14,39 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Torso + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 3, y: 3, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Head m_ScaleCurves: [] m_FloatCurves: - curve: @@ -22,15 +54,6 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 value: 1 inSlope: Infinity outSlope: Infinity @@ -41,60 +64,12 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Enabled - path: Bags + attribute: m_FlipX + path: Head classID: 212 script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_IsActive - path: Bags_Individual - classID: 1 - script: {fileID: 0} - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 7935234321397735378, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: 7935234321397735378, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: -3001681976893849735, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Bags - classID: 212 - script: {fileID: 0} - m_SampleRate: 30 + m_PPtrCurves: [] + m_SampleRate: 60 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -102,36 +77,33 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 3137090395 - attribute: 3305885265 + path: 130111906 + attribute: 555744692 script: {fileID: 0} typeID: 212 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 1143641605 - attribute: 2086281974 + path: 3869152129 + attribute: 1 script: {fileID: 0} - typeID: 1 + typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 3137090395 - attribute: 0 + path: 130111906 + attribute: 1 script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 7935234321397735378, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 7935234321397735378, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -3001681976893849735, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.56666666 + m_StopTime: 0 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -153,27 +125,113 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 + inSlope: 0 + outSlope: 0 + tangentMode: 136 weightedMode: 0 inWeight: 0 outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_Enabled - path: Bags - classID: 212 + attribute: m_LocalPosition.x + path: Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Torso + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 3 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: Head + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: Head + classID: 4 script: {fileID: 0} - curve: serializedVersion: 2 @@ -187,32 +245,21 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: m_IsActive - path: Bags_Individual - classID: 1 + attribute: m_FlipX + path: Head + classID: 212 script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 - m_Events: [] + m_Events: + - time: 0 + functionName: + data: + objectReferenceParameter: {fileID: -8293433933623156774, guid: 5332bfcb0761a2845b4373f67fdcd5dc, type: 3} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Idle.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim.meta similarity index 64% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Idle.anim.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim.meta index cafbc01d1..9701b8979 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/Idle.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/Idle.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 8788f06b64e06ce4aa77155f34f8733a +guid: df8bb10823e827c4398f7da486aba03b NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeSquash.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop.anim similarity index 70% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeSquash.anim rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop.anim index f1261a271..24b415460 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeSquash.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: CakeSquash + m_Name: IdleBop serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 @@ -19,8 +19,8 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: {x: -0.4, y: 0.11, z: 0} + time: 0.033333335 + value: {x: -0.329, y: 0.575, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -28,17 +28,8 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.11666667 - value: {x: -0.4, y: 0.055, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.21666667 - value: {x: -0.5, y: 0, z: 0} + time: 0.083333336 + value: {x: -0.404, y: 0.645, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -48,17 +39,38 @@ AnimationClip: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - path: + path: Head m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 - value: {fileID: -2859803398730630560, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.11666667 - value: {fileID: -4555232125690135383, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} + value: {fileID: -1457410329324320135, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.033333335 + value: {fileID: 7957578405759094433, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - time: 0.083333336 + value: {fileID: -7749792712589346508, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} attribute: m_Sprite - path: + path: Torso classID: 212 script: {fileID: 0} m_SampleRate: 60 @@ -69,28 +81,36 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 130111906 attribute: 1 script: {fileID: 0} typeID: 4 customType: 0 isPPtrCurve: 0 - serializedVersion: 2 - path: 0 + path: 130111906 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 3869152129 attribute: 0 script: {fileID: 0} typeID: 212 customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: -2859803398730630560, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -4555232125690135383, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} + - {fileID: -1457410329324320135, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: 7957578405759094433, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + - {fileID: -7749792712589346508, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.21666667 + m_StopTime: 0.1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -110,8 +130,8 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: -0.4 + time: 0.033333335 + value: -0.329 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -119,17 +139,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 - value: -0.4 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: -0.5 + time: 0.083333336 + value: -0.404 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -140,15 +151,15 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.x - path: + path: Head classID: 4 script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 - value: 0.11 + time: 0.033333335 + value: 0.575 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -156,17 +167,8 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 - value: 0.055 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 - value: 0 + time: 0.083333336 + value: 0.645 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -177,14 +179,14 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.y - path: + path: Head classID: 4 script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 0.033333335 value: 0 inSlope: Infinity outSlope: Infinity @@ -193,16 +195,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.11666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.21666667 + time: 0.083333336 value: 0 inSlope: Infinity outSlope: Infinity @@ -214,10 +207,29 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalPosition.z - path: + path: Head classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: Head + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: [] - m_HasGenericRootTransform: 1 + m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeIdle.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop.anim.meta similarity index 79% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeIdle.anim.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop.anim.meta index 9aeaaafe3..b9ce2ed48 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeIdle.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 40bedfbc9e9f39240bd7f62bd56ed6c7 +guid: 8c8e76794b4c3854fadf531d0562de8c NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim new file mode 100644 index 000000000..46a8579e9 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim @@ -0,0 +1,83 @@ +%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: IdleBop2 + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: 412d0016b83f0f8489680e4bef09cd9b, type: 3} + attribute: m_Sprite + path: test (1) + classID: 212 + script: {fileID: 0} + - curve: + - time: 0 + value: {fileID: -1457410329324320135, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + attribute: m_Sprite + path: Torso + classID: 212 + script: {fileID: 0} + 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: 131153305 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 3869152129 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 21300000, guid: 412d0016b83f0f8489680e4bef09cd9b, type: 3} + - {fileID: -1457410329324320135, guid: 15a4d1a63a113d64ab903fd38f759b6d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + 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/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeSquash.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim.meta similarity index 64% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeSquash.anim.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim.meta index be5bfa300..9c628afbd 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeSquash.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Boy/IdleBop2.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: ea45ba130e7db8a4ba257228053b2ddd +guid: 3c54e7dfb9aaa1342943b19c869ba72b NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteL.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteL.anim deleted file mode 100644 index bf799cd22..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteL.anim +++ /dev/null @@ -1,782 +0,0 @@ -%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: BiteL - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: 0, z: 8} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.25 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.3 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.34, y: 0.2, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.25 - value: {x: -0.15, y: 0.2, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.3 - value: {x: -0.15, y: 0.2, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Body - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.95, y: 0.8, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: -0.9, y: 0.74, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.25 - value: {x: -0.48, y: 0.8, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.3 - value: {x: -0.48, y: 0.8, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_FlipX - path: Body - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_FlipX - path: Head - classID: 212 - script: {fileID: 0} - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 5910607557738960350, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.25 - value: {fileID: -2680567283804148421, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Body - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -5497920933056538782, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.25 - value: {fileID: 3690334013328164605, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Head - classID: 212 - script: {fileID: 0} - 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: 2073732236 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1646240483 - attribute: 3305885265 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 2073732236 - attribute: 555744692 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 555744692 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 2073732236 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 130111906 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 5910607557738960350, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -2680567283804148421, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -5497920933056538782, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 3690334013328164605, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.3 - 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: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.34 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -0.15 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: -0.15 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0.2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.95 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -0.9 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: -0.48 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: -0.48 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0.74 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0.8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_FlipX - path: Body - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_FlipX - path: Head - classID: 212 - script: {fileID: 0} - m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Head - classID: 4 - script: {fileID: 0} - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteL.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteL.anim.meta deleted file mode 100644 index f96b35428..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteL.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9efd55a8903071d48bbf6456caa4e3ed -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteR.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteR.anim deleted file mode 100644 index fab395b01..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteR.anim +++ /dev/null @@ -1,692 +0,0 @@ -%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: BiteR - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: 0, y: 0, z: -8} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.25 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.3 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.34, y: 0.2, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.25 - value: {x: 0.15, y: 0.2, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.3 - value: {x: 0.15, y: 0.2, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Body - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0.95, y: 0.8, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.06666667 - value: {x: 0.9, y: 0.74, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.25 - value: {x: 0.48, y: 0.8, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.3 - value: {x: 0.48, y: 0.8, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: 5910607557738960350, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.25 - value: {fileID: -2680567283804148421, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Body - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -5497920933056538782, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.25 - value: {fileID: 3690334013328164605, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Head - classID: 212 - script: {fileID: 0} - 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: 2073732236 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 4 - script: {fileID: 0} - typeID: 4 - customType: 4 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1646240483 - attribute: 3305885265 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 2073732236 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 130111906 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: 5910607557738960350, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -2680567283804148421, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -5497920933056538782, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 3690334013328164605, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.3 - 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: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.34 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.15 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0.15 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0.2 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.95 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0.9 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.48 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0.48 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0.74 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0.8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0.8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.x - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.y - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.06666667 - value: -8 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.25 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: localEulerAnglesRaw.z - path: Head - classID: 4 - script: {fileID: 0} - m_EulerEditorCurves: - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.y - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.z - path: Head - classID: 4 - script: {fileID: 0} - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteR.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteR.anim.meta deleted file mode 100644 index 3ca2a820f..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/BiteR.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: a40fa04d251fb0d4e9c6b9c329bab618 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/HeadAndBody.controller.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/HeadAndBody.controller.meta deleted file mode 100644 index 75490406e..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/HeadAndBody.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 472cad424de9d1b4497bbbf69ee3f1c9 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Idle.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Idle.anim deleted file mode 100644 index bb2c33e02..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Idle.anim +++ /dev/null @@ -1,486 +0,0 @@ -%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: Idle - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: -0.03, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.56666666 - value: {x: -0.03, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Body - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.05, y: -0.06, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: -0.05, y: -0.04, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.56666666 - value: {x: -0.05, y: -0.04, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head/Face - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -4284576497444438019, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: 4693836351189835842, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: -3652738059706515719, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Head - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -6929352194190826025, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: -5272210261321560058, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: -4971957976712654573, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Body - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -6616705012483052128, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: -2893272201370579163, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: 3229745093122481892, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Head/Face - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -5486372003890969138, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: -6755901645142815425, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: 3223480979365912239, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Legs - classID: 212 - script: {fileID: 0} - m_SampleRate: 30 - 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: 2073732236 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1646240483 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1646240483 - attribute: 3305885265 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 2073732236 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 1646240483 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 1563094196 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -4284576497444438019, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 4693836351189835842, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -3652738059706515719, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -6929352194190826025, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -5272210261321560058, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -4971957976712654573, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -6616705012483052128, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -2893272201370579163, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 3229745093122481892, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -5486372003890969138, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -6755901645142815425, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 3223480979365912239, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.56666666 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: -0.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: -0.05 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Head/Face - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.06 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: -0.04 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: -0.04 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Head/Face - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Head/Face - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Open.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Open.anim deleted file mode 100644 index 4591624a1..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Open.anim +++ /dev/null @@ -1,566 +0,0 @@ -%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: Open - serializedVersion: 6 - m_Legacy: 0 - m_Compressed: 0 - m_UseHighQualityCurve: 1 - m_RotationCurves: [] - m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.2 - value: {x: -0.03, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.56666666 - value: {x: -0.03, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Body - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: -0.04, y: 0.71, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.56666666 - value: {x: -0.04, y: 0.71, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 0.56666666 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: Infinity, z: Infinity} - outSlope: {x: Infinity, y: Infinity, z: Infinity} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - path: Head/Face - m_ScaleCurves: [] - m_FloatCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - m_PPtrCurves: - - curve: - - time: 0 - value: {fileID: -6929352194190826025, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: -5272210261321560058, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: -4971957976712654573, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Body - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: 3962418017532597325, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: 5084912212372861364, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: -4510943112030000838, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Head - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -4672645930576840813, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: 1358992337433302959, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: 7528242461416680960, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Head/Face - classID: 212 - script: {fileID: 0} - - curve: - - time: 0 - value: {fileID: -5486372003890969138, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.2 - value: {fileID: -6755901645142815425, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - time: 0.4 - value: {fileID: 3223480979365912239, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - attribute: m_Sprite - path: Legs - classID: 212 - script: {fileID: 0} - m_SampleRate: 30 - 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: 2073732236 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 130111906 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1646240483 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 1646240483 - attribute: 3305885265 - script: {fileID: 0} - typeID: 212 - customType: 0 - isPPtrCurve: 0 - - serializedVersion: 2 - path: 2073732236 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 130111906 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 1646240483 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - - serializedVersion: 2 - path: 1563094196 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -6929352194190826025, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -5272210261321560058, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -4971957976712654573, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 3962418017532597325, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 5084912212372861364, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -4510943112030000838, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -4672645930576840813, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 1358992337433302959, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 7528242461416680960, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -5486372003890969138, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: -6755901645142815425, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - - {fileID: 3223480979365912239, guid: 1c435a9cfdcf1354c97f8822c5bb9e97, type: 3} - m_AnimationClipSettings: - serializedVersion: 2 - m_AdditiveReferencePoseClip: {fileID: 0} - m_AdditiveReferencePoseTime: 0 - m_StartTime: 0 - m_StopTime: 0.56666666 - m_OrientationOffsetY: 0 - m_Level: 0 - m_CycleOffset: 0 - m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 - m_LoopBlend: 0 - m_LoopBlendOrientation: 0 - m_LoopBlendPositionY: 0 - m_LoopBlendPositionXZ: 0 - m_KeepOriginalOrientation: 0 - m_KeepOriginalPositionY: 1 - m_KeepOriginalPositionXZ: 0 - m_HeightFromFeet: 0 - m_Mirror: 0 - m_EditorCurves: - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: -0.03 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.2 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Body - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: -0.04 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: -0.04 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0.71 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0.71 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Head - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.x - path: Head/Face - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.y - path: Head/Face - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.56666666 - value: 0 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalPosition.z - path: Head/Face - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: Infinity - outSlope: Infinity - tangentMode: 103 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_Enabled - path: Head/Face - classID: 212 - script: {fileID: 0} - m_EulerEditorCurves: [] - m_HasGenericRootTransform: 0 - m_HasMotionFloatCurves: 0 - m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Open.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Open.anim.meta deleted file mode 100644 index 8cdbda890..000000000 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Open.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 469de0aca845b3946ad4595f6c3ec97f -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/DoubleDate/!ref.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student.meta similarity index 77% rename from Assets/Scripts/Games/DoubleDate/!ref.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student.meta index 76c018bc2..900b31aaa 100644 --- a/Assets/Scripts/Games/DoubleDate/!ref.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 23f82e930f643ca4f8b84690380a5099 +guid: 97fe8efd387324c468109efe5f64699a folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim new file mode 100644 index 000000000..ef886b9c2 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim @@ -0,0 +1,81 @@ +%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: Hold + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -7280605794216780270, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.016666668 + value: {fileID: -1108324220791026482, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: -84044037535237813, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + 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: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -7280605794216780270, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -1108324220791026482, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -84044037535237813, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.050000004 + 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: + - time: 0 + functionName: TransitionBackToIdle + data: + objectReferenceParameter: {fileID: 0} + floatParameter: 0 + intParameter: 0 + messageOptions: 0 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutIdle.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim.meta similarity index 64% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutIdle.anim.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim.meta index 99fe82e82..44cbf3efa 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/DonutIdle.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Hold.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 017ca15979ffcf84cbae2725c80e884b +guid: f222cb3d546e73646b8403001dad487e NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim new file mode 100644 index 000000000..f32e84b5a --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim @@ -0,0 +1,74 @@ +%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: HoldBop + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 7890052151456789346, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: -5664848765385770971, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.1 + value: {fileID: -8624972230825856309, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + 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: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 7890052151456789346, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -5664848765385770971, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -8624972230825856309, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.11666667 + 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/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim.meta new file mode 100644 index 000000000..20df86077 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/HoldBop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b198949ba27ff194e8455d2fce6abcdc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: ntrdj/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim new file mode 100644 index 000000000..0f573fe42 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim @@ -0,0 +1,68 @@ +%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: Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + 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: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Idle.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim.meta similarity index 64% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Idle.anim.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim.meta index a256423a5..fad17ecf2 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/Idle.anim.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Idle.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 73954f3b61d12af4bbb8a9987ca08cd2 +guid: f4b8dd1650938af4cbfbeae39b2acbce NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim new file mode 100644 index 000000000..6844665b5 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim @@ -0,0 +1,74 @@ +%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: IdleBop + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -474008126291752816, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: 6775225630280950889, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.083333336 + value: {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + 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: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -474008126291752816, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: 6775225630280950889, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -3590603051934361286, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.1 + 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/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim.meta new file mode 100644 index 000000000..90d03bf5b --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/IdleBop.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ed72452f85eae646b8847b58f47906e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: ntrdj/common + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/HeadAndBody.controller b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller similarity index 50% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/HeadAndBody.controller rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller index 7c4fafe67..244053666 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/HeadAndBody/HeadAndBody.controller +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller @@ -1,6 +1,32 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-7582875468689897617 +--- !u!1102 &-7055007684483605004 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hold + 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: 3958816d51b511b4a9c0505c45de204a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4698968861401447970 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -8,10 +34,9 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Idle - m_Speed: 1 + m_Speed: 0 m_CycleOffset: 0 - m_Transitions: - - {fileID: -5830524336562198632} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -21,49 +46,24 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 5a8296bf99fdc9045a04cd2e2ca83232, type: 2} + m_Motion: {fileID: 7400000, guid: 8512f23eb7c8ffd4eb866fbabedcd2ac, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-7146084541194602277 -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: ShouldOpenMouth - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6556734439381316777} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &-6556734439381316777 +--- !u!1102 &-1143804635325942891 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Open - m_Speed: 1 + m_Name: Unhold + m_Speed: -1 m_CycleOffset: 0 m_Transitions: - - {fileID: -794931006004068967} + - {fileID: 5013820772242190312} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -73,81 +73,22 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 7328a378cb6afa348a659804dbb2c43a, type: 2} + m_Motion: {fileID: 7400000, guid: 3958816d51b511b4a9c0505c45de204a, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &-6345825102141324145 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -7582875468689897617} - m_Position: {x: 230, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: -6556734439381316777} - m_Position: {x: 450, y: 0, z: 0} - - serializedVersion: 1 - m_State: {fileID: 7652238886521958325} - m_Position: {x: 230, y: 130, z: 0} - - serializedVersion: 1 - m_State: {fileID: 2063283151983040233} - m_Position: {x: 450, y: 130, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -7582875468689897617} ---- !u!1101 &-5830524336562198632 +--- !u!1101 &-295531023391595954 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: ShouldOpenMouth - m_EventTreshold: 0 + m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6556734439381316777} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-5369731440578853250 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: ShouldOpenMouth - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7582875468689897617} + m_DstState: {fileID: -4698968861401447970} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -156,98 +97,23 @@ AnimatorStateTransition: m_TransitionOffset: 0 m_ExitTime: 0 m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &-3844334686909638787 -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: ShouldOpenMouth - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -6556734439381316777} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-794931006004068967 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: ShouldOpenMouth - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7582875468689897617} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1107 &-738134980165046649 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Layer - m_ChildStates: [] - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 0} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: HeadAndBody + m_Name: Student serializedVersion: 5 - m_AnimatorParameters: - - m_Name: ShouldOpenMouth - m_Type: 4 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer - m_StateMachine: {fileID: -6345825102141324145} + m_StateMachine: {fileID: 6962450605454016305} m_Mask: {fileID: 0} m_Motions: [] m_Behaviours: [] @@ -257,19 +123,17 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &2063283151983040233 +--- !u!1102 &1884598382658345919 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BiteL + m_Name: HoldBop m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: 8845306833759416547} - - {fileID: -7146084541194602277} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -279,25 +143,23 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 33eca70d256430246823f38385913b91, type: 2} + m_Motion: {fileID: 7400000, guid: d83059a036ff2bc4fabac58e92982fcf, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &7652238886521958325 +--- !u!1102 &2611244123214319260 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: BiteR + m_Name: Scratcho m_Speed: 1 m_CycleOffset: 0 - m_Transitions: - - {fileID: -5369731440578853250} - - {fileID: -3844334686909638787} + m_Transitions: [] m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -307,25 +169,22 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: cbeddea37ba66d840a5de01b8ceb7242, type: 2} + m_Motion: {fileID: 0} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &8845306833759416547 +--- !u!1101 &5013820772242190312 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: ShouldOpenMouth - m_EventTreshold: 0 + m_Conditions: [] m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -7582875468689897617} + m_DstState: {fileID: -4698968861401447970} m_Solo: 0 m_Mute: 0 m_IsExit: 0 @@ -334,7 +193,97 @@ AnimatorStateTransition: m_TransitionOffset: 0 m_ExitTime: 0 m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1107 &6962450605454016305 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7055007684483605004} + m_Position: {x: 490, y: -90, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1884598382658345919} + m_Position: {x: 580, y: -160, z: 0} + - serializedVersion: 1 + m_State: {fileID: 8690647671553181706} + m_Position: {x: 540, y: 100, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4698968861401447970} + m_Position: {x: 270, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7914765862687888288} + m_Position: {x: 330, y: -170, z: 0} + - serializedVersion: 1 + m_State: {fileID: -1143804635325942891} + m_Position: {x: 490, y: -30, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -4698968861401447970} +--- !u!1102 &7914765862687888288 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: IdleBop + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -295531023391595954} + 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: c5fc1cff93334064a805a2de41ad3cbc, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &8690647671553181706 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Swipe + 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: 3a79ba8317b15824f876dd2e0802ac0f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeBag.controller.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller.meta similarity index 64% rename from Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeBag.controller.meta rename to Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller.meta index 6e066c5f1..ed2a3670a 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Bags/CakeBag.controller.meta +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Student.controller.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: cbff7a416b586a642a4985f51fe231ca +guid: a5caee39ddd8dd24087e05c8df233265 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim new file mode 100644 index 000000000..6699f6401 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim @@ -0,0 +1,74 @@ +%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: Swipe + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 5817979385575274063, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.033333335 + value: {fileID: -2717095282070868293, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - time: 0.083333336 + value: {fileID: -6154985277085878723, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + attribute: m_Sprite + path: Sprite + classID: 212 + script: {fileID: 0} + 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: 850496168 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 5817979385575274063, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -2717095282070868293, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + - {fileID: -6154985277085878723, guid: 32c8faf1ec4cce943bbb31418502333b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.1 + 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/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim.meta b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim.meta new file mode 100644 index 000000000..d5015c60a --- /dev/null +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/test files/Student/Swipe.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e9c4714187d68c1449bda3ec4a2c27ab +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: ntrdj/common + assetBundleVariant: diff --git a/Assets/Scripts/Games/DoubleDate/Animations.meta b/Assets/Scripts/Games/DoubleDate/Animations.meta deleted file mode 100644 index d6c9d0429..000000000 --- a/Assets/Scripts/Games/DoubleDate/Animations.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9ffd26135b25b774aa5f6e4352eeebcf -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs index 82bd79b96..342d0f1ff 100644 --- a/Assets/Scripts/Games/DoubleDate/DoubleDate.cs +++ b/Assets/Scripts/Games/DoubleDate/DoubleDate.cs @@ -12,6 +12,16 @@ namespace HeavenStudio.Games.Loaders return new Minigame("doubleDate", "Double Date \n[INITIALIZATION ONLY]", "0058CE", false, false, new List() { new GameAction("soccerBall", "Soccer Ball") + { + function = delegate { var e = eventCaller.currentEntity; DoubleDate.instance.ball(e.beat, e["type"]); }, + defaultLength = 2, + }, + new GameAction("basketball", "Basketball") + { + function = delegate { var e = eventCaller.currentEntity; DoubleDate.instance.ball(e.beat, e["type"]); }, + defaultLength = 2, + }, + new GameAction("football", "Football") { function = delegate { var e = eventCaller.currentEntity; DoubleDate.instance.ball(e.beat, e["type"]); }, defaultLength = 2, @@ -29,18 +39,22 @@ namespace HeavenStudio.Games { public static DoubleDate instance; - public enum soccerBall { - soccerBall, - } - [Header("Objects")] public Animator soccerBallAnim; + public Animator basketballAnim; + public Animator footballAnim; private void Awake() { instance = this; } + private void HitSound(bool applause) + { + Jukebox.PlayOneShotGame("doubleDate/kick"); + if (applause) Jukebox.PlayOneShot("applause"); + } + public void ball(float beat, int type) { Jukebox.PlayOneShotGame("doubleDate/soccerBall");