From 7deb2745a06d7ecfa0847b64f3e4b4c2bc262f8c Mon Sep 17 00:00:00 2001 From: AstrlJelly Date: Sat, 8 Jun 2024 13:16:33 -0400 Subject: [PATCH] Revert "new icon, face animating" This reverts commit c93cdfe4f8dd8d1d2dd5a477ce26cf2a6c19b05e. --- Assets/Resources/Games/dressYourBest.prefab | 2 +- .../GameIcons/dressYourBest_mask.png.meta | 123 ---- .../DressYourBest/Animations/Girl/Faces.meta | 8 - .../Animations/Girl/Faces/GirlDefault.anim | 68 -- .../Girl/Faces/GirlDefault.anim.meta | 8 - .../Animations/Girl/GirlAnim.controller | 4 +- .../Girl/{Faces => }/GirlCorrect.anim | 0 .../Girl/{Faces => }/GirlCorrect.anim.meta | 0 .../Girl/{Faces => }/GirlIncorrect.anim | 0 .../Girl/{Faces => }/GirlIncorrect.anim.meta | 0 .../Girl/{Faces => }/GirlLooking.anim | 0 .../Girl/{Faces => }/GirlLooking.anim.meta | 0 .../Animations/Monkey/Faces.meta | 8 - .../Monkey/Faces/MonkeyCorrect.anim | 68 -- .../Monkey/Faces/MonkeyCorrect.anim.meta | 8 - .../Monkey/Faces/MonkeyDefault.anim | 68 -- .../Monkey/Faces/MonkeyDefault.anim.meta | 8 - .../Monkey/Faces/MonkeyIncorrect.anim | 68 -- .../Monkey/Faces/MonkeyIncorrect.anim.meta | 8 - .../Animations/Monkey/MonkeyAnim.controller | 60 -- .../Animations/SewingMachine/SewNot.anim | 646 ------------------ .../Animations/SewingMachine/SewNot.anim.meta | 8 - .../SewingMachineAnim.controller | 29 - .../Games/DressYourBest/DressYourBest.cs | 92 +-- 24 files changed, 23 insertions(+), 1261 deletions(-) delete mode 100644 Assets/Resources/Sprites/Editor/GameIcons/dressYourBest_mask.png.meta delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces.meta delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlDefault.anim delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlDefault.anim.meta rename Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/{Faces => }/GirlCorrect.anim (100%) rename Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/{Faces => }/GirlCorrect.anim.meta (100%) rename Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/{Faces => }/GirlIncorrect.anim (100%) rename Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/{Faces => }/GirlIncorrect.anim.meta (100%) rename Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/{Faces => }/GirlLooking.anim (100%) rename Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/{Faces => }/GirlLooking.anim.meta (100%) delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces.meta delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyCorrect.anim delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyCorrect.anim.meta delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyDefault.anim delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyDefault.anim.meta delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyIncorrect.anim delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyIncorrect.anim.meta delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewNot.anim delete mode 100644 Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewNot.anim.meta diff --git a/Assets/Resources/Games/dressYourBest.prefab b/Assets/Resources/Games/dressYourBest.prefab index 1ea331ff..960e1fa1 100644 --- a/Assets/Resources/Games/dressYourBest.prefab +++ b/Assets/Resources/Games/dressYourBest.prefab @@ -752,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 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/dressYourBest_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/dressYourBest_mask.png.meta deleted file mode 100644 index 417bc916..00000000 --- a/Assets/Resources/Sprites/Editor/GameIcons/dressYourBest_mask.png.meta +++ /dev/null @@ -1,123 +0,0 @@ -fileFormatVersion: 2 -guid: d6f5325069af11941baec179623263f5 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - cookieLightType: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Server - maxTextureSize: 2048 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces.meta deleted file mode 100644 index e2ec94c2..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d695757fb9863c542931957cce7e6cc8 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlDefault.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlDefault.anim deleted file mode 100644 index f81f0b28..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlDefault.anim +++ /dev/null @@ -1,68 +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: GirlDefault - 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: -1748562713, 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: -1748562713, 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/Faces/GirlDefault.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlDefault.anim.meta deleted file mode 100644 index 6490d47a..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlDefault.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9c9834d6ca86c3a4cb7ea1defe1989d1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller index b68ceb4a..9b5c1efb 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlAnim.controller @@ -133,7 +133,7 @@ AnimatorController: m_Behaviours: [] m_BlendingMode: 0 m_SyncedLayerIndex: -1 - m_DefaultWeight: 1 + m_DefaultWeight: 0 m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} @@ -214,7 +214,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 9c9834d6ca86c3a4cb7ea1defe1989d1, type: 2} + m_Motion: {fileID: 0} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlCorrect.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim similarity index 100% rename from Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlCorrect.anim rename to Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlCorrect.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlCorrect.anim.meta rename to Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlCorrect.anim.meta diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlIncorrect.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim similarity index 100% rename from Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlIncorrect.anim rename to Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlIncorrect.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlIncorrect.anim.meta rename to Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlIncorrect.anim.meta diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlLooking.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim similarity index 100% rename from Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlLooking.anim rename to Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlLooking.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim.meta similarity index 100% rename from Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/Faces/GirlLooking.anim.meta rename to Assets/Resources/Sprites/Games/DressYourBest/Animations/Girl/GirlLooking.anim.meta diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces.meta deleted file mode 100644 index c849b180..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: aee694d0176a8444686c9b948d263c2f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyCorrect.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyCorrect.anim deleted file mode 100644 index aabc6cb4..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyCorrect.anim +++ /dev/null @@ -1,68 +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: MonkeyCorrect - 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: -2055584907, guid: 91eefdf066035514b82191a67d108b89, 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: 130111906 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -2055584907, 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/Monkey/Faces/MonkeyCorrect.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyCorrect.anim.meta deleted file mode 100644 index 876ef1cf..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyCorrect.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cfd96695df349724791682c162ceb9c1 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyDefault.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyDefault.anim deleted file mode 100644 index 1e8cccc4..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyDefault.anim +++ /dev/null @@ -1,68 +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: MonkeyDefault - 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: -2055584907, guid: 91eefdf066035514b82191a67d108b89, 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: 130111906 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -2055584907, 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/Monkey/Faces/MonkeyDefault.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyDefault.anim.meta deleted file mode 100644 index d76293c4..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyDefault.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d3d05f18c59195d48af612294ccbe6eb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyIncorrect.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyIncorrect.anim deleted file mode 100644 index 8410c419..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyIncorrect.anim +++ /dev/null @@ -1,68 +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: MonkeyIncorrect - 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: -2055584907, guid: 91eefdf066035514b82191a67d108b89, 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: 130111906 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - pptrCurveMapping: - - {fileID: -2055584907, 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/Monkey/Faces/MonkeyIncorrect.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyIncorrect.anim.meta deleted file mode 100644 index 92bb65ee..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/Faces/MonkeyIncorrect.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1e0250de52541f54b8137ca93a43b7a8 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 7400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyAnim.controller b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyAnim.controller index 3353b462..48dc5f57 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyAnim.controller +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/Monkey/MonkeyAnim.controller @@ -74,18 +74,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} - - serializedVersion: 5 - m_Name: Emotions - m_StateMachine: {fileID: 4650706990511529687} - 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 &3192757657389531236 AnimatorStateMachine: serializedVersion: 6 @@ -140,51 +128,3 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &4650706990511529687 -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: 8118728865878460043} - m_Position: {x: 370, y: 150, 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: 8118728865878460043} ---- !u!1102 &8118728865878460043 -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: d3d05f18c59195d48af612294ccbe6eb, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewNot.anim b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewNot.anim deleted file mode 100644 index ba66d0c8..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewNot.anim +++ /dev/null @@ -1,646 +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: SewNot - 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/SewNot.anim.meta b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewNot.anim.meta deleted file mode 100644 index dcf9d9ba..00000000 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewNot.anim.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d03a558e17bd2444da73892280ae1def -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 9cef1867..a235176a 100644 --- a/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewingMachineAnim.controller +++ b/Assets/Resources/Sprites/Games/DressYourBest/Animations/SewingMachine/SewingMachineAnim.controller @@ -89,9 +89,6 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -4999009970337506221} m_Position: {x: 337.14932, y: 183.12218, z: 0} - - serializedVersion: 1 - m_State: {fileID: 5598599761240868013} - m_Position: {x: 390, y: 120, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -102,29 +99,3 @@ AnimatorStateMachine: m_ExitPosition: {x: 800, y: 120, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -4999009970337506221} ---- !u!1102 &5598599761240868013 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Miss - 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: d03a558e17bd2444da73892280ae1def, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/Assets/Scripts/Games/DressYourBest/DressYourBest.cs b/Assets/Scripts/Games/DressYourBest/DressYourBest.cs index ab26a88e..2e663970 100644 --- a/Assets/Scripts/Games/DressYourBest/DressYourBest.cs +++ b/Assets/Scripts/Games/DressYourBest/DressYourBest.cs @@ -18,7 +18,7 @@ namespace HeavenStudio.Games.Loaders { return new Minigame("dressYourBest", "Dress Your Best!", "d593dd", false, false, new List() { - new GameAction("bop", "Bop", "Characters") + new GameAction("bop", "Bop") { function = delegate { var e = eventCaller.currentEntity; @@ -37,7 +37,7 @@ namespace HeavenStudio.Games.Loaders new("auto", true, "Bop (Auto)", "Toggle if the selected characters should automatically bop until another Bop event is reached."), } }, - new GameAction("start interval", "Start Interval", "Cues") + new GameAction("start interval", "Start Interval") { preFunction = delegate { var e = eventCaller.currentEntity; @@ -55,7 +55,7 @@ namespace HeavenStudio.Games.Loaders new("autoReact", true, "Auto React", "Toggle if the reaction should be on by default."), } }, - new GameAction("monkey call", "Monkey Call", "Cues") + new GameAction("monkey call", "Monkey Call") { inactiveFunction = delegate { var e = eventCaller.currentEntity; @@ -67,11 +67,9 @@ namespace HeavenStudio.Games.Loaders new("callSfx", DressYourBest.CallSFX.Long, "Call SFX", "Set the type of sound effect to use for the call.") } }, - new GameAction("pass turn", "Pass Turn", "Cues") + new GameAction("pass turn", "Pass Turn") { - preFunction = delegate { - SoundByte.PlayOneShotGame("dressYourBest/pass_turn", eventCaller.currentEntity.beat); - }, + // preFunction = delegate { function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.TryGetMinigame(out DressYourBest instance)) { @@ -84,23 +82,22 @@ namespace HeavenStudio.Games.Loaders new("auto", true, "Auto React", "Toggle if the reaction should be on by default.") } }, - new GameAction("interval react", "Interval React", "Characters") + new GameAction("interval react", "Interval React") { // preFunction = delegate { function = delegate { var e = eventCaller.currentEntity; if (eventCaller.gameManager.TryGetMinigame(out DressYourBest instance)) { - instance.IntervalReact(e.beat, e.length); + instance.IntervalReact(); } }, defaultLength = 1f, - resizable = true, // parameters = new List() // { // new("auto", true, "Auto React", "Toggle if the reaction should be on by default.") // } }, - new GameAction("background appearance", "Background Appearance", "Appearance") + new GameAction("background appearance", "Background Appearance") { function = delegate { var e = eventCaller.currentEntity; @@ -116,22 +113,6 @@ namespace HeavenStudio.Games.Loaders new("ease", Util.EasingFunction.Ease.Linear, "Ease", "Set the easing of the action.") }, }, - new GameAction("change emotion", "Change Emotion", "Characters") - { - // preFunction = delegate { - function = delegate { - var e = eventCaller.currentEntity; - if (eventCaller.gameManager.TryGetMinigame(out DressYourBest instance)) { - instance.ChangeEmotion((DressYourBest.Characters)e["character"], (DressYourBest.Faces)e["face"]); - } - }, - defaultLength = 1f, - parameters = new List() - { - new("character", DressYourBest.Characters.Girl, "Character", "Set the character to change the face of."), - new("face", DressYourBest.Faces.Idle, "Face", "Set the face to change to."), - } - }, } ); } @@ -151,7 +132,7 @@ namespace HeavenStudio.Games public enum Faces { - Idle, + Default, Looking, Happy, Sad, @@ -297,19 +278,9 @@ namespace HeavenStudio.Games _ = BeatAction.New(this, actions); } - public void ChangeEmotion(Characters character, Faces emotion) - { - if (character is Characters.Girl or Characters.Both) { - ChangeEmotion(girlAnim, emotion); - } - if (character is Characters.Monkey or Characters.Both) { - ChangeEmotion(monkeyAnim, emotion); - } - } - private void ChangeEmotion(Animator anim, Faces emotion) { - Debug.Log("emotion : " + emotion); + Debug.Log(emotion.ToString()); anim.DoScaledAnimationAsync(emotion.ToString(), 0.5f, animLayer: 1); } @@ -326,18 +297,16 @@ namespace HeavenStudio.Games }; foreach (RiqEntity call in neededCalls) { - // Debug.Log("call.beat : " + call.beat); + Debug.Log("call.beat : " + call.beat); if (call.beat < startBeat) continue; sounds.Add(new("dressYourBest/monkey_call_" + (call["callSfx"] + 1), call.beat)); actions.Add(new(call.beat, () => monkeyAnim.DoScaledAnimationAsync("Call", 0.5f))); } + // have to add this after all the other actions as actions are done in order of beat if (autoPass) { - // have to add this after all the other actions as actions are done in order of beat actions.Add(new(beat + length, delegate { PassTurn(beat + length, autoReact, beat, length, neededCalls); })); - // epic sound scheduling - SoundByte.PlayOneShotGame("dressYourBest/pass_turn", beat + length); } _ = MultiSound.Play(sounds); _ = BeatAction.New(this, actions); @@ -355,8 +324,8 @@ namespace HeavenStudio.Games neededCalls ??= GetNeededCalls(startIntervalBeat, startIntervalLength); if (neededCalls.Count <= 0) return; // do the actual stuff under here - ChangeEmotion(girlAnim, Faces.Idle); SetLightFromState(LightState.Repeating); + SoundByte.PlayOneShotGame("dressYourBest/pass_turn"); // "Any" check instead of just checking the last one? if (neededCalls[^1].beat != beat) { monkeyAnim.DoScaledAnimationAsync("Idle", 0.5f); @@ -368,9 +337,9 @@ namespace HeavenStudio.Games _ = ScheduleInput(beat, relativeBeat + 1, InputAction_BasicPress, OnHit, OnMiss, null); } if (autoReact) { - double reactBeat = (beat * 2) - startIntervalBeat + 1; - BeatAction.New(this, new() { new(reactBeat, delegate { - IntervalReact(reactBeat, 1); + // BeatAction.New(this, new() { new(beat - startIntervalBeat + beat + 1, delegate { + BeatAction.New(this, new() { new(beat + beat - startIntervalBeat + 1, delegate { + IntervalReact(); })}); } } @@ -380,45 +349,24 @@ namespace HeavenStudio.Games return callEntities.FindAll(e => e.beat >= beat && e.beat <= beat + length); } - public void IntervalReact(double beat, float length) + public void IntervalReact() { - Faces reaction = HasMissed ? Faces.Sad : Faces.Happy; + Faces reaction = (hasMissed || hitCount <= 0) ? Faces.Sad : Faces.Happy; ChangeEmotion(monkeyAnim, reaction); ChangeEmotion(girlAnim, reaction); LightState lightState = (LightState)reaction; SetLightFromState(lightState); - // there's not a good way to schedule this afaik. - // there might be some way to like, schedule the sound then change the sound source when missed? that could work maybe SoundByte.PlayOneShotGame("dressYourBest/" + lightState.ToString().ToLower()); - - // maybe wanna use a beat value that's checked in the update loop - // that would let people specify - _ = BeatAction.New(this, new() { - new(beat + length, delegate { - ChangeEmotion(monkeyAnim, Faces.Idle); - ChangeEmotion(girlAnim, Faces.Idle); - SetLightFromState(LightState.IdleOrListening); - }) - }); } private int hitCount = 0; // resets every pass turn private bool hasMissed = false; - private bool HasMissed => hasMissed || hitCount <= 0; private void OnHit(PlayerActionEvent caller, float state) { - hitCount++; SoundByte.PlayOneShotGame("dressYourBest/hit_1"); SoundByte.PlayOneShotGame("dressYourBest/hit_2", pitch: SoundByte.GetPitchFromSemiTones(hitCount, false)); - if (state is >= 1f or <= (-1f)) // barely - { - sewingAnim.DoScaledAnimationAsync("Miss", 0.5f); - hasMissed = true; - } - else // just - { - sewingAnim.DoScaledAnimationAsync("Hit", 0.5f); - } + sewingAnim.DoScaledAnimationAsync("Hit", 0.5f); + hitCount++; } private void OnMiss(PlayerActionEvent caller) {