From b75f39a31bede650984f6128c3eb6117f95bcfed Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Wed, 5 Jun 2024 15:04:09 -0400 Subject: [PATCH] nearly finished, just gotta add some polish --- Assets/Resources/Games/dressYourBest.prefab | 182 ++++- .../{fail.wav.meta => correct.wav.meta} | 2 +- .../{success.wav.meta => incorrect.wav.meta} | 2 +- .../Animations/Girl/GirlAnim.controller | 151 +++- .../Animations/Girl/GirlCorrect.anim | 68 ++ .../Animations/Girl/GirlCorrect.anim.meta | 8 + .../Animations/Girl/GirlIncorrect.anim | 68 ++ .../Animations/Girl/GirlIncorrect.anim.meta | 8 + .../Animations/Girl/GirlLooking.anim | 68 ++ .../Animations/Girl/GirlLooking.anim.meta | 8 + .../Animations/Monkey/MonkeyCall.anim | 12 +- .../SewingMachine/Light/LightAnim.controller | 62 +- .../Animations/SewingMachine/Sew.anim | 646 ++++++++++++++++++ .../Animations/SewingMachine/Sew.anim.meta | 8 + .../SewingMachineAnim.controller | 91 ++- .../DressYourBest/DYB_spritesheet.png.meta | 22 +- .../Games/DressYourBest/DressYourBest.cs | 73 +- 17 files changed, 1431 insertions(+), 48 deletions(-) rename Assets/Resources/Sfx/games/dressYourBest/{fail.wav.meta => correct.wav.meta} (91%) rename Assets/Resources/Sfx/games/dressYourBest/{success.wav.meta => incorrect.wav.meta} (91%) create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim.meta create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim create mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim.meta diff --git a/Assets/Resources/Games/dressYourBest.prefab b/Assets/Resources/Games/dressYourBest.prefab index d4c762ac..960e1fa1 100644 --- a/Assets/Resources/Games/dressYourBest.prefab +++ b/Assets/Resources/Games/dressYourBest.prefab @@ -286,6 +286,8 @@ Transform: - {fileID: 1122926130738430674} - {fileID: 214024670141119148} - {fileID: 4420373070191729286} + - {fileID: 8226260808373746563} + - {fileID: 5878401426804739814} m_Father: {fileID: 5715047164748654698} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -750,7 +752,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &8336220536032857166 Transform: m_ObjectHideFlags: 0 @@ -871,7 +873,7 @@ MonoBehaviour: SoundSequences: [] girlAnim: {fileID: 2937590231589242979} monkeyAnim: {fileID: 3536726533992943518} - sewingAnim: {fileID: 0} + sewingAnim: {fileID: 6037582727269570347} bgSpriteRenderer: {fileID: 2629062112903974991} lightRenderer: {fileID: 1403303695239245045} lightMaterialTemplate: {fileID: 2100000, guid: 42b863c88a7a9c4428440728fee737bb, type: 2} @@ -909,7 +911,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3613224206301273430} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.882, y: -2.4099998, z: 0} + m_LocalPosition: {x: 0.853, y: -1.711, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1304,6 +1306,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &5447213683965329154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5878401426804739814} + - component: {fileID: 6005429031339719397} + m_Layer: 0 + m_Name: WooshFX2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5878401426804739814 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5447213683965329154} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.224, y: -3.433, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3350458927318833813} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &6005429031339719397 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5447213683965329154} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_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: 1100 + m_Sprite: {fileID: 68380396, guid: 91eefdf066035514b82191a67d108b89, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 1 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.23920266, y: 0.70431894} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &5555175038130275063 GameObject: m_ObjectHideFlags: 0 @@ -1627,7 +1713,7 @@ GameObject: - component: {fileID: 4420373070191729286} - component: {fileID: 9196615776117304521} m_Layer: 0 - m_Name: FX + m_Name: SlamFX m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1641,7 +1727,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6926557567286723404} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.036, y: -4.0619993, z: 0} + m_LocalPosition: {x: 0.887, y: -3.955, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1688,7 +1774,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1000 m_Sprite: {fileID: -1245819356, guid: 91eefdf066035514b82191a67d108b89, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1700,6 +1786,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &6997978986662358373 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8226260808373746563} + - component: {fileID: 8052881429806980902} + m_Layer: 0 + m_Name: WooshFX1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8226260808373746563 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6997978986662358373} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.493, y: -3.372, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3350458927318833813} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8052881429806980902 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6997978986662358373} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_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: 1100 + m_Sprite: {fileID: 68380396, guid: 91eefdf066035514b82191a67d108b89, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.23920266, y: 0.70431894} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &8644947211045643633 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Sfx/games/dressYourBest/fail.wav.meta b/Assets/Resources/Sfx/games/dressYourBest/correct.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/dressYourBest/fail.wav.meta rename to Assets/Resources/Sfx/games/dressYourBest/correct.wav.meta index a4b078fd..cae1b677 100644 --- a/Assets/Resources/Sfx/games/dressYourBest/fail.wav.meta +++ b/Assets/Resources/Sfx/games/dressYourBest/correct.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4b428c3028881264187e232fed876953 +guid: e1d2ff4fc248e4a4bb668e9225832fa2 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sfx/games/dressYourBest/success.wav.meta b/Assets/Resources/Sfx/games/dressYourBest/incorrect.wav.meta similarity index 91% rename from Assets/Resources/Sfx/games/dressYourBest/success.wav.meta rename to Assets/Resources/Sfx/games/dressYourBest/incorrect.wav.meta index 9663cd9f..2159b491 100644 --- a/Assets/Resources/Sfx/games/dressYourBest/success.wav.meta +++ b/Assets/Resources/Sfx/games/dressYourBest/incorrect.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4c146180ff0e0164ea643b19063a190c +guid: b60ed362d94fdc84da5b23d95809bf90 AudioImporter: externalObjects: {} serializedVersion: 6 diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller index bf9e0fb2..9b5c1efb 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller @@ -26,6 +26,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-7468335330467401961 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Sad + 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: 804f816b73096be4382917e4a735a9ba, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-4817394413453815060 AnimatorState: serializedVersion: 6 @@ -40,7 +66,7 @@ AnimatorState: m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 - m_WriteDefaultValues: 1 + m_WriteDefaultValues: 0 m_Mirror: 0 m_SpeedParameterActive: 0 m_MirrorParameterActive: 0 @@ -66,7 +92,7 @@ AnimatorStateMachine: m_Position: {x: 400.8607, y: 167.10483, z: 0} - serializedVersion: 1 m_State: {fileID: -4817394413453815060} - m_Position: {x: 390.7923, y: 55.177094, z: 0} + m_Position: {x: 400, y: 90, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -99,3 +125,124 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Emotions + m_StateMachine: {fileID: 3022450605590523536} + 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 &2867993719081206576 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Looking + 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: e0eed5fed97308947b95fe35f13e10d7, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &3022450605590523536 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Emotions + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -7468335330467401961} + m_Position: {x: 370, y: -50, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5083483994446426235} + m_Position: {x: 400, y: 10, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3226889661951044800} + m_Position: {x: 390, y: 150, z: 0} + - serializedVersion: 1 + m_State: {fileID: 2867993719081206576} + m_Position: {x: 440, y: 70, 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: 3226889661951044800} +--- !u!1102 &3226889661951044800 +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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &5083483994446426235 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Happy + 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: ed48ffab3878f064cbfb4e57347402e4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim new file mode 100644 index 00000000..6e26d8be --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.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: GirlCorrect + 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: 1100034159, guid: 91eefdf066035514b82191a67d108b89, type: 3} + attribute: m_Sprite + path: HeadAndHair/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: 709132057 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1100034159, guid: 91eefdf066035514b82191a67d108b89, 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/DressYourBest/Animations/Girl/GirlCorrect.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim.meta new file mode 100644 index 00000000..6202058d --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ed48ffab3878f064cbfb4e57347402e4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim new file mode 100644 index 00000000..184f9083 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.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: GirlIncorrect + 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: -1870230043, guid: 91eefdf066035514b82191a67d108b89, type: 3} + attribute: m_Sprite + path: HeadAndHair/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: 709132057 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1870230043, guid: 91eefdf066035514b82191a67d108b89, 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/DressYourBest/Animations/Girl/GirlIncorrect.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim.meta new file mode 100644 index 00000000..5699b89a --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 804f816b73096be4382917e4a735a9ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim new file mode 100644 index 00000000..36ad2f2b --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.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: GirlLooking + 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: 1698877662, guid: 91eefdf066035514b82191a67d108b89, type: 3} + attribute: m_Sprite + path: HeadAndHair/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: 709132057 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: 1698877662, guid: 91eefdf066035514b82191a67d108b89, 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/DressYourBest/Animations/Girl/GirlLooking.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim.meta new file mode 100644 index 00000000..fd72a0c6 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e0eed5fed97308947b95fe35f13e10d7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyCall.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyCall.anim index 07475a1a..3dff0ece 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyCall.anim +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyCall.anim @@ -28,7 +28,7 @@ AnimationClip: inWeight: {x: 0, y: 0.33333334, z: 0.33333334} outWeight: {x: 0, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.083333336 + time: 0.13333334 value: {x: -4.121, y: 0.77, z: 0} inSlope: {x: Infinity, y: Infinity, z: 0} outSlope: {x: 0, y: Infinity, z: 0} @@ -71,7 +71,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.083333336 + time: 0.13333334 value: 0 inSlope: Infinity outSlope: Infinity @@ -90,7 +90,7 @@ AnimationClip: - curve: - time: 0 value: {fileID: -1983626645, guid: 91eefdf066035514b82191a67d108b89, type: 3} - - time: 0.083333336 + - time: 0.13333334 value: {fileID: -2055584907, guid: 91eefdf066035514b82191a67d108b89, type: 3} attribute: m_Sprite path: Head @@ -154,7 +154,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.1 + m_StopTime: 0.15 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -202,7 +202,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.083333336 + time: 0.13333334 value: 0.77 inSlope: Infinity outSlope: Infinity @@ -249,7 +249,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.083333336 + time: 0.13333334 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Light/LightAnim.controller b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Light/LightAnim.controller index c21b5e34..3f4b0698 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Light/LightAnim.controller +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Light/LightAnim.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8646364931340484468 +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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +35,38 @@ AnimatorController: m_Name: LightAnim serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 8136340823745384676} + 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 &8136340823745384676 +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: -8646364931340484468} + m_Position: {x: 333.28055, y: 119.93211, 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: -8646364931340484468} diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim new file mode 100644 index 00000000..cce22c89 --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim @@ -0,0 +1,646 @@ +%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: Sew + 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.865, y: -2.472, 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.865, y: -2.472, 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.865, y: -2.3352578, 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.1 + value: {x: 0.86277777, y: -2.143026, 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.13333334 + value: {x: 0.85837036, y: -1.9299856, 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.16666667 + value: {x: 0.853, y: -1.711, 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: Needle + 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: 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 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + 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: SlamFX + classID: 1 + 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.033333335 + 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 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + 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: WooshFX2 + classID: 1 + 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.033333335 + 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 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + 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: WooshFX1 + classID: 1 + 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: 1660217139 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1729935590 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 819959400 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 2849425362 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.16666667 + 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.865 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: 0.865 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 0.86277777 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0.85837036 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0.853 + 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: Needle + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -2.472 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.033333335 + value: -2.472 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.06666667 + value: -2.3352578 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: -2.143026 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: -1.9299856 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: -1.711 + 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: Needle + 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.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.13333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + 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: Needle + 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 + - serializedVersion: 3 + time: 0.033333335 + 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 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + 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: SlamFX + classID: 1 + 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.033333335 + 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 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + 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: WooshFX2 + classID: 1 + 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.033333335 + 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 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13333334 + 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: WooshFX1 + classID: 1 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim.meta new file mode 100644 index 00000000..9a6e0dcb --- /dev/null +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/Sew.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9d38b59ef05b75b44adcf623272a2557 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewingMachineAnim.controller b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewingMachineAnim.controller index 61ca532a..a235176a 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewingMachineAnim.controller +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewingMachineAnim.controller @@ -1,5 +1,57 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-4999009970337506221 +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: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-514967566069774770 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Hit + 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: 9d38b59ef05b75b44adcf623272a2557, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -9,4 +61,41 @@ AnimatorController: m_Name: SewingMachineAnim serializedVersion: 5 m_AnimatorParameters: [] - m_AnimatorLayers: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 2113473348992583680} + 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 &2113473348992583680 +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: -514967566069774770} + m_Position: {x: 374.54752, y: 65.76924, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4999009970337506221} + m_Position: {x: 337.14932, y: 183.12218, 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: -4999009970337506221} diff --git a/Assets/Resources/Sprites/Games/DressYourBest/DYB_spritesheet.png.meta b/Assets/Resources/Sprites/Games/DressYourBest/DYB_spritesheet.png.meta index e2afa21c..43bc3915 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/DYB_spritesheet.png.meta +++ b/Assets/Resources/Sprites/Games/DressYourBest/DYB_spritesheet.png.meta @@ -364,8 +364,8 @@ TextureImporter: y: 1845 width: 78 height: 222 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.46207368, y: 0.97140914} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -385,8 +385,8 @@ TextureImporter: y: 1852 width: 65 height: 215 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.4360314, y: 0.9706009} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -406,8 +406,8 @@ TextureImporter: y: 1863 width: 106 height: 202 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.47064784, y: 0.9755932} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -427,8 +427,8 @@ TextureImporter: y: 1862 width: 59 height: 204 - alignment: 0 - pivot: {x: 0.5, y: 0.5} + alignment: 9 + pivot: {x: 0.48758194, y: 0.9726634} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -633,9 +633,9 @@ TextureImporter: name: DYB_spritesheet_17 rect: serializedVersion: 2 - x: 3219 + x: 3209 y: 764 - width: 793 + width: 803 height: 780 alignment: 0 pivot: {x: 0.5, y: 0.5} @@ -722,7 +722,7 @@ TextureImporter: width: 332 height: 299 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Assets/Scripts/Games/DressYourBest/DressYourBest.cs b/Assets/Scripts/Games/DressYourBest/DressYourBest.cs index bbab1cb8..2e663970 100644 --- a/Assets/Scripts/Games/DressYourBest/DressYourBest.cs +++ b/Assets/Scripts/Games/DressYourBest/DressYourBest.cs @@ -16,7 +16,7 @@ namespace HeavenStudio.Games.Loaders { public static Minigame AddGame(EventCaller eventCaller) { - return new Minigame("dressYourBest", "Dress Your Best", "d593dd", false, false, new List() + return new Minigame("dressYourBest", "Dress Your Best!", "d593dd", false, false, new List() { new GameAction("bop", "Bop") { @@ -49,7 +49,9 @@ namespace HeavenStudio.Games.Loaders resizable = true, parameters = new List() { - new("autoPass", true, "Auto Pass Turn", "Toggle if the turn should be passed automatically at the end of the start interval."), + new("autoPass", true, "Auto Pass Turn", "Toggle if the turn should be passed automatically at the end of the start interval.", new() { + new((x, _) => (bool)x, "autoReact"), + }), new("autoReact", true, "Auto React", "Toggle if the reaction should be on by default."), } }, @@ -67,7 +69,8 @@ namespace HeavenStudio.Games.Loaders }, new GameAction("pass turn", "Pass Turn") { - preFunction = delegate { + // preFunction = delegate { + function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.TryGetMinigame(out DressYourBest instance)) { instance.PassTurn(e.beat, e["auto"]); @@ -79,6 +82,21 @@ namespace HeavenStudio.Games.Loaders new("auto", true, "Auto React", "Toggle if the reaction should be on by default.") } }, + new GameAction("interval react", "Interval React") + { + // preFunction = delegate { + function = delegate { + var e = eventCaller.currentEntity; + if (eventCaller.gameManager.TryGetMinigame(out DressYourBest instance)) { + instance.IntervalReact(); + } + }, + defaultLength = 1f, + // parameters = new List() + // { + // new("auto", true, "Auto React", "Toggle if the reaction should be on by default.") + // } + }, new GameAction("background appearance", "Background Appearance") { function = delegate { @@ -112,6 +130,14 @@ namespace HeavenStudio.Games Both, } + public enum Faces + { + Default, + Looking, + Happy, + Sad, + } + public enum CallSFX { Long, @@ -124,7 +150,7 @@ namespace HeavenStudio.Games IdleOrListening, Repeating, Correct, - Wrong, + Incorrect, } [Header("Animators")] @@ -175,7 +201,7 @@ namespace HeavenStudio.Games public override void OnLateBeatPulse(double beat) { if (girlBop && !girlAnim.IsPlayingAnimationNames()) { - girlAnim.DoScaledAnimationAsync("Bop", 0.5f); + girlAnim.DoScaledAnimationAsync("Bop", 0.5f, animLayer: 0); } if (monkeyBop && !monkeyAnim.IsPlayingAnimationNames("Call")) { monkeyAnim.DoScaledAnimationAsync("Bop", 0.5f); @@ -239,7 +265,7 @@ namespace HeavenStudio.Games // not super necessary, but just creating one callback that gets added to, then assigned to a beataction is just simpler BeatAction.EventCallback bopAction = delegate { }; if (characters is Characters.Girl or Characters.Both) { - bopAction += () => girlAnim.DoScaledAnimationAsync("Bop", 0.5f); + bopAction += () => girlAnim.DoScaledAnimationAsync("Bop", 0.5f, animLayer: 0); } if (characters is Characters.Monkey or Characters.Both) { bopAction += () => monkeyAnim.DoScaledAnimationAsync("Bop", 0.5f); @@ -252,6 +278,12 @@ namespace HeavenStudio.Games _ = BeatAction.New(this, actions); } + private void ChangeEmotion(Animator anim, Faces emotion) + { + Debug.Log(emotion.ToString()); + anim.DoScaledAnimationAsync(emotion.ToString(), 0.5f, animLayer: 1); + } + // startBeat exists so actions that happened when inactive aren't done again. that would suck public void QueueStartInterval(double beat, float length, bool autoPass, bool autoReact, double startBeat = double.MinValue) { @@ -260,11 +292,8 @@ namespace HeavenStudio.Games if (startBeat < beat + length) { List sounds = new(); - List actions = new() { // first beat of start interval stuff - // might not be necessary? - // new(beat, delegate { - // monkeyAnimator.DoScaledAnimationAsync("StartCalling", 0.5f, animLayer: 1); - // }) + List actions = new() { + new(beat, () => ChangeEmotion(girlAnim, Faces.Looking)) }; foreach (RiqEntity call in neededCalls) { @@ -287,7 +316,7 @@ namespace HeavenStudio.Games public void PassTurn(double beat, bool autoReact, double startIntervalBeat = double.NaN, float startIntervalLength = float.NaN, List neededCalls = null) { if (double.IsNaN(startIntervalBeat) || double.IsNaN(startIntervalLength)) { - RiqEntity startInterval = gameManager.Beatmap.Entities.FindLast(e => e.beat + e.length < beat); + RiqEntity startInterval = gameManager.Beatmap.Entities.FindLast(e => e.datamodel == "dressYourBest/start interval" && e.beat + e.length < beat); if (startInterval == null) return; startIntervalBeat = startInterval.beat; startIntervalLength = startInterval.length; @@ -295,11 +324,10 @@ namespace HeavenStudio.Games neededCalls ??= GetNeededCalls(startIntervalBeat, startIntervalLength); if (neededCalls.Count <= 0) return; // do the actual stuff under here + SetLightFromState(LightState.Repeating); SoundByte.PlayOneShotGame("dressYourBest/pass_turn"); // "Any" check instead of just checking the last one? if (neededCalls[^1].beat != beat) { - // might wanna check if if a bop is already playing, too? - // down to visual preference. monkeyAnim.DoScaledAnimationAsync("Idle", 0.5f); } hitCount = 0; @@ -309,8 +337,9 @@ namespace HeavenStudio.Games _ = ScheduleInput(beat, relativeBeat + 1, InputAction_BasicPress, OnHit, OnMiss, null); } if (autoReact) { - BeatAction.New(this, new() { new(beat - startIntervalBeat + beat, delegate { - + // BeatAction.New(this, new() { new(beat - startIntervalBeat + beat + 1, delegate { + BeatAction.New(this, new() { new(beat + beat - startIntervalBeat + 1, delegate { + IntervalReact(); })}); } } @@ -322,11 +351,16 @@ namespace HeavenStudio.Games public void IntervalReact() { - + Faces reaction = (hasMissed || hitCount <= 0) ? Faces.Sad : Faces.Happy; + ChangeEmotion(monkeyAnim, reaction); + ChangeEmotion(girlAnim, reaction); + LightState lightState = (LightState)reaction; + SetLightFromState(lightState); + SoundByte.PlayOneShotGame("dressYourBest/" + lightState.ToString().ToLower()); } private int hitCount = 0; // resets every pass turn - private bool hasMissed = true; + private bool hasMissed = false; private void OnHit(PlayerActionEvent caller, float state) { SoundByte.PlayOneShotGame("dressYourBest/hit_1"); @@ -336,7 +370,8 @@ namespace HeavenStudio.Games } private void OnMiss(PlayerActionEvent caller) { - + hitCount = 0; + hasMissed = true; } } } \ No newline at end of file