diff --git a/Assets/Resources/Credits.txt b/Assets/Resources/Credits.txt index dffb32968..b131603aa 100644 --- a/Assets/Resources/Credits.txt +++ b/Assets/Resources/Credits.txt @@ -19,6 +19,7 @@ -Bhaos -RaffyTaffy14 -Thinedave +-Marc / ThePurpleAnon Artwork -Ko Takeuchi (Original Rhythm Heaven Assets) @@ -106,4 +107,4 @@ https://github.com/RHeavenStudio/HeavenStudio/blob/master/LICENSE.md https://github.com/RHeavenStudio/HeavenStudio https://discord.gg/5rdEq2SFNj - \ No newline at end of file + diff --git a/Assets/Resources/Games/kitties.prefab b/Assets/Resources/Games/kitties.prefab index 46612e116..5a3558e63 100644 --- a/Assets/Resources/Games/kitties.prefab +++ b/Assets/Resources/Games/kitties.prefab @@ -50,9 +50,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: SoundSequences: [] - EligibleHits: [] scheduledInputs: [] - firstEnable: 0 player: {fileID: 7454126704339270245} kitties: - {fileID: 8422149772840757146} @@ -73,7 +71,6 @@ MonoBehaviour: - 0 - 0 - 0 - currentBGColor: {r: 1, g: 1, b: 1, a: 0} --- !u!1 &3078320056411217663 GameObject: m_ObjectHideFlags: 0 @@ -681,6 +678,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7036960847367506643} m_Modifications: + - target: {fileID: 89599264273707703, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_Color.a + value: 0.6313726 + objectReference: {fileID: 0} - target: {fileID: 351456659208781754, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} propertyPath: m_LocalPosition.x value: -0.1 @@ -773,6 +774,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2042595381267795738, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_Color.a + value: 0.3764706 + objectReference: {fileID: 0} - target: {fileID: 2355602929664985000, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} propertyPath: m_LocalPosition.x value: -2.76 @@ -801,6 +806,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 2879578650466968521, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_Color.a + value: 0.3764706 + objectReference: {fileID: 0} - target: {fileID: 3058374496064346722, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} propertyPath: m_RootOrder value: 4 @@ -809,6 +818,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 4615050534224793853, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_Color.a + value: 0.3764706 + objectReference: {fileID: 0} - target: {fileID: 4666926648281214805, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} propertyPath: m_Size.x value: 1 @@ -849,6 +862,10 @@ PrefabInstance: propertyPath: m_SortingOrder value: -1 objectReference: {fileID: 0} + - target: {fileID: 5550474323110700500, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_Color.a + value: 0.3764706 + objectReference: {fileID: 0} - target: {fileID: 5708132237603999281, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} propertyPath: m_LocalPosition.x value: -2.83 @@ -933,6 +950,10 @@ PrefabInstance: propertyPath: m_LocalPosition.z value: -2.583691 objectReference: {fileID: 0} + - target: {fileID: 7636484177345751252, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} + propertyPath: m_Color.a + value: 0.3764706 + objectReference: {fileID: 0} - target: {fileID: 7708050652662539783, guid: d3b29c99cb1e18c4fba59ed3feb6a183, type: 3} propertyPath: m_LocalPosition.x value: 3.13 @@ -1009,6 +1030,38 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7036960847367506643} m_Modifications: + - target: {fileID: 1250984528353694784, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_FlipX + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4584113699555345342, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_IsActive value: 0 @@ -1125,6 +1178,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7036960847367506643} m_Modifications: + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3555030977011516957, guid: ab46f36f89873b64d838385a0ffe5b9a, type: 3} propertyPath: m_LocalPosition.z value: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png index 2826172d5..df64b06ee 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png and b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta index fb71449d9..c5096182b 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png new file mode 100644 index 000000000..68e872239 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png.meta new file mode 100644 index 000000000..d2876ad98 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/mannequinFactory_mask.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: 794a65993846fe34a9de36e06e63773d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 1 + enableMipMap: 1 + 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: 8 + 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: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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/Editor/GameIcons/manzai.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta index a3052ceb6..a32417aec 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/manzai.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta index f85a51eed..9f93b7120 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch.png.meta @@ -5,7 +5,7 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 + mipMapMode: 1 enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 1024 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta index b15b317ee..2e01e9aff 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/monkeyWatch_mask.png.meta @@ -5,8 +5,8 @@ TextureImporter: externalObjects: {} serializedVersion: 12 mipmaps: - mipMapMode: 0 - enableMipMap: 0 + mipMapMode: 1 + enableMipMap: 1 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 @@ -67,10 +67,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta index 0d16ff4e3..887e425a8 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/nightWalkAgb.png.meta @@ -70,7 +70,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta index f9e56820c..4d16e06ee 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/totemClimb_mask.png.meta @@ -34,7 +34,7 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 1 - aniso: 1 + aniso: 8 mipBias: 0 wrapU: 1 wrapV: 1 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtSuccess.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtSuccess.anim index f0ab145b2..e61782267 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtSuccess.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/CaughtSuccess.anim @@ -100,7 +100,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -1.2, y: 2.29, z: 0} + value: {x: -1.182, y: 2.173, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -704,7 +704,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.2 + value: -1.182 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -723,7 +723,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 2.29 + value: 2.173 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Clap1.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/Clap1.anim index 23b9ecbb4..d321b5906 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/Clap1.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Clap1.anim @@ -14,7 +14,41 @@ AnimationClip: m_RotationCurves: [] m_CompressedRotationCurves: [] m_EulerCurves: [] - m_PositionCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 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.125 + value: {x: 0.11, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Kitty m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: @@ -27,6 +61,8 @@ AnimationClip: value: {fileID: 6615670241960667488, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} - time: 0.125 value: {fileID: -4825644759080002611, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} + - time: 0.16666667 + value: {fileID: -5801956193589078948, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} attribute: m_Sprite path: Kitty classID: 212 @@ -38,6 +74,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 2656932650 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2656932650 attribute: 0 @@ -50,12 +93,13 @@ AnimationClip: - {fileID: 2450051006318353345, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} - {fileID: 6615670241960667488, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} - {fileID: -4825644759080002611, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} + - {fileID: -5801956193589078948, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.16666667 + m_StopTime: 0.20833334 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -70,7 +114,118 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 0.11 + 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.x + path: Kitty + 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.125 + 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.y + path: Kitty + 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.125 + 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: Kitty + classID: 4 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClap.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClap.anim index bdddeefac..8df1e1a99 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClap.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClap.anim @@ -154,7 +154,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -842,7 +842,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 0.07 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClapFail.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClapFail.anim index 31da4bc68..0a6634013 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClapFail.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceClapFail.anim @@ -20,8 +20,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: 1.542} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -29,8 +29,8 @@ AnimationClip: - serializedVersion: 3 time: 0.083333336 value: {x: 0, y: 0, z: 16.561} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -38,8 +38,8 @@ AnimationClip: - serializedVersion: 3 time: 0.125 value: {x: 0, y: 0, z: 33.569} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -47,8 +47,8 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: {x: 0, y: 0, z: 49.545} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -63,8 +63,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0, y: 0, z: -1.731} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -72,8 +72,8 @@ AnimationClip: - serializedVersion: 3 time: 0.083333336 value: {x: 0, y: 0, z: -15.45} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -81,8 +81,8 @@ AnimationClip: - serializedVersion: 3 time: 0.125 value: {x: 0, y: 0, z: -33.133} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -90,8 +90,8 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: {x: 0, y: 0, z: -45.473} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + 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} @@ -106,16 +106,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, 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.041666668 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -124,7 +124,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.083333336 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -133,7 +133,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.125 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -142,7 +142,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -151,7 +151,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.20833333 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -168,8 +168,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0.23, y: 0.98, z: 0} - inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: Infinity, 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} @@ -177,8 +177,8 @@ AnimationClip: - serializedVersion: 3 time: 0.041666668 value: {x: 0.23, y: 0.98, z: 0} - inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: Infinity, 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} @@ -186,8 +186,8 @@ AnimationClip: - serializedVersion: 3 time: 0.083333336 value: {x: 0.17, y: 1.76, z: 0} - inSlope: {x: -2.4, y: Infinity, z: 0} - outSlope: {x: -2.4, y: Infinity, 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} @@ -195,8 +195,8 @@ AnimationClip: - serializedVersion: 3 time: 0.125 value: {x: 0.03, y: 2.72, z: 0} - inSlope: {x: -2.28, y: Infinity, z: 0} - outSlope: {x: -2.28, y: Infinity, 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} @@ -204,8 +204,8 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: {x: -0.02, y: 1.46, z: 0} - inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: Infinity, 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} @@ -213,8 +213,8 @@ AnimationClip: - serializedVersion: 3 time: 0.20833333 value: {x: -0.02, y: 1.46, z: 0} - inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: Infinity, 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} @@ -229,8 +229,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0.25, y: 0.43, z: 0} - inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: Infinity, 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} @@ -238,8 +238,8 @@ AnimationClip: - serializedVersion: 3 time: 0.041666668 value: {x: 0.25, y: 0.43, z: 0} - inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: Infinity, 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} @@ -247,8 +247,8 @@ AnimationClip: - serializedVersion: 3 time: 0.083333336 value: {x: 0.03, y: 0.53, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: Infinity, 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} @@ -256,8 +256,8 @@ AnimationClip: - serializedVersion: 3 time: 0.125 value: {x: -0.75, y: -0.07, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: Infinity, 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} @@ -265,8 +265,8 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: {x: -0.99, y: -0.76, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: Infinity, 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} @@ -281,8 +281,8 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 0.52, y: 0.4600001, z: 0} - inSlope: {x: 0, y: Infinity, z: 0} - outSlope: {x: 0, y: Infinity, 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} @@ -290,8 +290,8 @@ AnimationClip: - serializedVersion: 3 time: 0.083333336 value: {x: 0.73, y: 0.5, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: Infinity, 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} @@ -299,8 +299,8 @@ AnimationClip: - serializedVersion: 3 time: 0.125 value: {x: 1.42, y: -0.16, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: Infinity, 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} @@ -308,8 +308,8 @@ AnimationClip: - serializedVersion: 3 time: 0.16666667 value: {x: 1.73, y: -0.66, z: 0} - inSlope: {x: Infinity, y: Infinity, z: 0} - outSlope: {x: Infinity, y: Infinity, 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} @@ -465,6 +465,13 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 2656932650 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2169038173 attribute: 1 @@ -528,13 +535,6 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 - - serializedVersion: 2 - path: 2656932650 - attribute: 1 - script: {fileID: 0} - typeID: 4 - customType: 0 - isPPtrCurve: 0 pptrCurveMapping: - {fileID: -6507884322407430924, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} - {fileID: -6507884322407430924, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} @@ -569,9 +569,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -632,16 +632,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 0.07 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.041666668 - value: 0 + value: 0.07 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -650,7 +650,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 0 + value: 0.07 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -659,7 +659,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 - value: 0 + value: 0.07 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -668,7 +668,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0 + value: 0.07 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -677,7 +677,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 - value: 0 + value: 0.07 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -697,9 +697,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -825,54 +825,54 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.23 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.041666668 value: 0.23 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0.17 - inSlope: -2.4 - outSlope: -2.4 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0.03 - inSlope: -2.28 - outSlope: -2.28 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: -0.02 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 value: -0.02 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -953,54 +953,54 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.041666668 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1017,18 +1017,18 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.041666668 value: 0.25 - inSlope: 0 - outSlope: 0 - tangentMode: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1127,45 +1127,45 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.041666668 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1182,36 +1182,36 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1228,36 +1228,36 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1348,9 +1348,9 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0.52 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1440,36 +1440,36 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1486,36 +1486,36 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1532,36 +1532,36 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceFailNewIdle.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceFailNewIdle.anim index 582182517..c47263861 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceFailNewIdle.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceFailNewIdle.anim @@ -20,13 +20,13 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} + inSlope: {x: Infinity, y: 0, z: 0} + outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + 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 @@ -48,13 +48,6 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: - - serializedVersion: 2 - path: 2656932650 - attribute: 0 - script: {fileID: 0} - typeID: 212 - customType: 23 - isPPtrCurve: 1 - serializedVersion: 2 path: 2656932650 attribute: 1 @@ -62,6 +55,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2656932650 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 pptrCurveMapping: - {fileID: -6507884322407430924, guid: bf45531f01bb98d48809dda2ebe18c81, type: 3} m_AnimationClipSettings: @@ -91,12 +91,12 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -109,13 +109,13 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: 0.07 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -129,12 +129,12 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceNewIdle.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceNewIdle.anim index bd7ad6164..f4fd51c9f 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/FaceNewIdle.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/FaceNewIdle.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: 0, y: 0.07, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -109,7 +109,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: 0.07 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/RollStart.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/RollStart.anim index 7104cd6e2..7b536ede4 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/RollStart.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/RollStart.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: -0.2, z: 0} + value: {x: 0, y: -0.15, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -55,7 +55,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1.0075313, y: 0.88559, z: 1} + value: {x: 1.0075313, y: 0.91879964, z: 1} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -171,7 +171,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.2 + value: -0.15 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -282,7 +282,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.88559 + value: 0.91879964 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/Kitties/Animations/Rolling.anim b/Assets/Resources/Sprites/Games/Kitties/Animations/Rolling.anim index 96a8b91cf..896666646 100644 --- a/Assets/Resources/Sprites/Games/Kitties/Animations/Rolling.anim +++ b/Assets/Resources/Sprites/Games/Kitties/Animations/Rolling.anim @@ -13,61 +13,122 @@ AnimationClip: m_UseHighQualityCurve: 1 m_RotationCurves: [] m_CompressedRotationCurves: [] - m_EulerCurves: [] - m_PositionCurves: + m_EulerCurves: - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} - inSlope: {x: 0, y: 0, z: Infinity} - outSlope: {x: 0, y: 0, z: Infinity} + value: {x: 0, y: 0, z: -29.647} + 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.041666668 - value: {x: -0.5, y: 0, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + value: {x: 0, y: 0, z: -14.151} + 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.083333336 - value: {x: 0, y: 0, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + value: {x: 0, y: 0, z: 10.072} + 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.125 - value: {x: -0.5, y: 0, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + value: {x: 0, y: 0, z: 21.108} + 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, y: 0, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + value: {x: 0, y: 0, z: 10.072} + 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.20833333 - value: {x: -0.5, y: 0, z: 0} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + value: {x: 0, y: 0, z: -14.151} + 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: Kitty + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: -0.08, y: -0.33, 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.041666668 + value: {x: 0.34, y: -0.17, 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.083333336 + value: {x: -0.67, y: -0.14, 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.125 + value: {x: -0.59, y: -0.35, 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.67, y: -0.14, 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.20833333 + value: {x: 0.34, y: -0.17, 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} @@ -83,17 +144,44 @@ AnimationClip: - serializedVersion: 3 time: 0 value: {x: 1, y: 1, z: 1} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.041666668 + value: {x: 1, y: 1, z: 1} + 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.083333336 - value: {x: -1, y: 1, z: 1} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + value: {x: 1, y: 1, z: 1} + 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.125 + value: {x: 1, y: 1, z: 1} + 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: 1, y: 1, z: 1} + 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} @@ -101,8 +189,8 @@ AnimationClip: - serializedVersion: 3 time: 0.20833333 value: {x: 1, y: 1, z: 1} - inSlope: {x: Infinity, y: 0, z: 0} - outSlope: {x: Infinity, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -111,7 +199,71 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Kitty - m_FloatCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.041666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.20833333 + 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_FlipX + path: Kitty + classID: 212 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -144,6 +296,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2656932650 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 - serializedVersion: 2 path: 2656932650 attribute: 3 @@ -151,6 +310,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2656932650 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2656932650 attribute: 0 @@ -191,16 +357,16 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.08 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.041666668 - value: -0.5 + value: 0.34 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -209,7 +375,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 0 + value: -0.67 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -218,7 +384,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 - value: -0.5 + value: -0.59 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -227,7 +393,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0 + value: -0.67 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -236,7 +402,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 - value: -0.5 + value: 0.34 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -255,55 +421,55 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.33 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.041666668 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.17 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.14 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.35 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.14 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: -0.17 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -329,45 +495,45 @@ AnimationClip: - serializedVersion: 3 time: 0.041666668 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.125 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -390,9 +556,36 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.041666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 - value: -1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 1 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -421,27 +614,54 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.041666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -458,27 +678,54 @@ AnimationClip: - serializedVersion: 3 time: 0 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.041666668 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.083333336 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 0.20833333 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -489,7 +736,293 @@ AnimationClip: path: Kitty classID: 4 script: {fileID: 0} - m_EulerEditorCurves: [] + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.041666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.083333336 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.125 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.20833333 + 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_FlipX + path: Kitty + classID: 212 + 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.041666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + 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 + - serializedVersion: 3 + time: 0.20833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: Kitty + 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.041666668 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + 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 + - serializedVersion: 3 + time: 0.20833333 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: Kitty + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -29.647 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.041666668 + value: -14.151 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.083333336 + value: 10.072 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.125 + value: 21.108 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 10.072 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.20833333 + value: -14.151 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: Kitty + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Kitty + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: Kitty + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: Kitty + classID: 4 + script: {fileID: 0} m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 m_Events: [] diff --git a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png index d3cf329c7..19e9db905 100644 Binary files a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png and b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png differ diff --git a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta index f55c17187..f422b4a3a 100644 --- a/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta +++ b/Assets/Resources/Sprites/Games/Kitties/kittiesSprites.png.meta @@ -259,7 +259,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs index f2344a8e6..e5dce774f 100644 --- a/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs +++ b/Assets/Scripts/Games/MrUpbeat/MrUpbeat.cs @@ -266,7 +266,7 @@ namespace HeavenStudio.Games private void ScheduleStep(double beat) { PlayerActionEvent input = ScheduleInput(beat, 0.5f, InputAction_BasicPress, Success, Miss, Nothing); - input.IsHittable = () => man.canStep && man.canStepFromAnim && man.FacingCorrectly(); + // input.IsHittable = () => man.canStep && man.canStepFromAnim && man.FacingCorrectly(); } private void RecursiveStepping(double beat) diff --git a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs index 791a4e88d..0bfc9c935 100644 --- a/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs +++ b/Assets/Scripts/Games/MunchyMonk/MunchyMonk.cs @@ -286,16 +286,6 @@ namespace HeavenStudio.Games if (dumplings.Count != 0) InputFunctions(3); } - // blushes when done eating but not when staring - if (needBlush - && !MonkAnim.IsPlayingAnimationNames("Eat", "Stare", "Barely", "Miss") - && !isStaring - && !noBlush) - { - MonkAnim.DoScaledAnimationAsync("Blush", 0.5f); - needBlush = false; - } - // sets hair stuff active when it needs to be if (growLevel > 0) { StacheHolder.SetActive(true); @@ -346,6 +336,19 @@ namespace HeavenStudio.Games } } + private void LateUpdate() + { + // blushes when done eating but not when staring + if (needBlush + && !MonkAnim.IsPlayingAnimationNames("Eat", "Stare", "Barely", "Miss") + && !isStaring + && !noBlush) + { + MonkAnim.DoScaledAnimationAsync("Blush", 0.5f); + needBlush = false; + } + } + public override void OnBeatPulse(double beat) { if ((MonkAnim.IsAnimationNotPlaying() || MonkAnim.IsPlayingAnimationNames("Bop", "Idle"))