From 6fda5e48b5774545f1d5636baa55c3513cb6332e Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 3 May 2023 10:42:41 -0700 Subject: [PATCH] a few small things changed camera in brasslands and cave, made pin animation shorter --- Assets/Animations/Tambourine/Pin.anim | 44 ++++++++++++++++----------- Assets/Scenes/Brasslands.unity | 4 +-- Assets/Scenes/GrappleScene.unity | 4 +-- 3 files changed, 30 insertions(+), 22 deletions(-) diff --git a/Assets/Animations/Tambourine/Pin.anim b/Assets/Animations/Tambourine/Pin.anim index 673d46f..1ca5950 100644 --- a/Assets/Animations/Tambourine/Pin.anim +++ b/Assets/Animations/Tambourine/Pin.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Pin - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -29,7 +29,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.2 + time: 0.1 value: {x: 0.06, y: 0.06, z: 0.06} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -38,7 +38,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.4 + time: 0.2 value: {x: 0.02, y: 0.02, z: 0.02} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -47,7 +47,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 0.6 + time: 0.3 value: {x: 0.04, y: 0.04, z: 0.04} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -61,7 +61,7 @@ AnimationClip: path: m_FloatCurves: [] m_PPtrCurves: [] - m_SampleRate: 10 + m_SampleRate: 20 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -75,13 +75,15 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.6 + m_StopTime: 0.3 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -97,7 +99,8 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - curve: + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -110,7 +113,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.1 value: 0.06 inSlope: 0 outSlope: 0 @@ -119,7 +122,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.2 value: 0.02 inSlope: 0 outSlope: 0 @@ -128,7 +131,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6 + time: 0.3 value: 0.04 inSlope: 0 outSlope: 0 @@ -143,7 +146,9 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -156,7 +161,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.1 value: 0.06 inSlope: 0 outSlope: 0 @@ -165,7 +170,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.2 value: 0.02 inSlope: 0 outSlope: 0 @@ -174,7 +179,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6 + time: 0.3 value: 0.04 inSlope: 0 outSlope: 0 @@ -189,7 +194,9 @@ AnimationClip: path: classID: 4 script: {fileID: 0} - - curve: + flags: 16 + - serializedVersion: 2 + curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 @@ -202,7 +209,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.2 + time: 0.1 value: 0.06 inSlope: 0 outSlope: 0 @@ -211,7 +218,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.4 + time: 0.2 value: 0.02 inSlope: 0 outSlope: 0 @@ -220,7 +227,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 0.6 + time: 0.3 value: 0.04 inSlope: 0 outSlope: 0 @@ -235,6 +242,7 @@ AnimationClip: path: classID: 4 script: {fileID: 0} + flags: 16 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Scenes/Brasslands.unity b/Assets/Scenes/Brasslands.unity index a4c11b2..d5378c2 100644 --- a/Assets/Scenes/Brasslands.unity +++ b/Assets/Scenes/Brasslands.unity @@ -19723,7 +19723,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 4 + orthographic size: 4.5 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -19770,7 +19770,7 @@ MonoBehaviour: xOffset: 3 yOffset: 1 smoothing: 6 - size: 4 + size: 4.5 xLocked: 0 yLocked: 0 --- !u!1 &1052999762 diff --git a/Assets/Scenes/GrappleScene.unity b/Assets/Scenes/GrappleScene.unity index c4baeeb..cc962d2 100644 --- a/Assets/Scenes/GrappleScene.unity +++ b/Assets/Scenes/GrappleScene.unity @@ -2004,7 +2004,7 @@ Camera: far clip plane: 1000 field of view: 34 orthographic: 1 - orthographic size: 9 + orthographic size: 7 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -2051,7 +2051,7 @@ MonoBehaviour: xOffset: 3 yOffset: 1 smoothing: 6 - size: 9 + size: 7 xLocked: 0 yLocked: 0 --- !u!1001 &525785197