diff --git a/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim b/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim index 10a55bf2..7762943f 100644 --- a/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim +++ b/Assets/Art/UI/Tutorial/Animations/UIANIM_Tutorial2.anim @@ -816,7 +816,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2.9666667 + time: 2.4666667 value: 1 inSlope: Infinity outSlope: Infinity @@ -825,7 +825,25 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 5.633333 + time: 3.4 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 4.4333334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 5.366667 value: 0 inSlope: Infinity outSlope: Infinity @@ -846,7 +864,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 2.9666667 + time: 2.4666667 value: 336 inSlope: 0 outSlope: 0 @@ -855,7 +873,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3333333 + time: 2.8333333 value: 278.0001 inSlope: 0 outSlope: 0 @@ -864,7 +882,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.0333333 + time: 3.1333334 value: 278.0001 inSlope: 0 outSlope: 0 @@ -873,8 +891,44 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.633333 - value: 449 + time: 3.4 + value: 366 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.4333334 + value: 336 + inSlope: -62.857075 + outSlope: -62.857075 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.8 + value: 278.0001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.1 + value: 278.0001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.366667 + value: 366 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -903,7 +957,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 2.9666667 + time: 2.4666667 value: -411 inSlope: 0 outSlope: 0 @@ -912,7 +966,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3333333 + time: 2.8333333 value: -359.5001 inSlope: 0 outSlope: 0 @@ -921,7 +975,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.0333333 + time: 3.1333334 value: -359.5001 inSlope: 0 outSlope: 0 @@ -930,8 +984,44 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.633333 - value: -523 + time: 3.4 + value: -411 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.4333334 + value: -411 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.8 + value: -359.5001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.1 + value: -359.5001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.366667 + value: -411 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -969,7 +1059,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 3.3333333 + time: 2.8333333 value: 1 inSlope: Infinity outSlope: Infinity @@ -978,7 +1068,25 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 5.0333333 + time: 3.1333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 4.8 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 5.1 value: 0 inSlope: Infinity outSlope: Infinity @@ -4149,7 +4257,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 2.9666667 + time: 2.4666667 value: 1 inSlope: Infinity outSlope: Infinity @@ -4158,7 +4266,25 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 5.633333 + time: 3.4 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 4.4333334 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 5.366667 value: 0 inSlope: Infinity outSlope: Infinity @@ -4179,7 +4305,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 2.9666667 + time: 2.4666667 value: 336 inSlope: 0 outSlope: 0 @@ -4188,7 +4314,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3333333 + time: 2.8333333 value: 278.0001 inSlope: 0 outSlope: 0 @@ -4197,7 +4323,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.0333333 + time: 3.1333334 value: 278.0001 inSlope: 0 outSlope: 0 @@ -4206,8 +4332,44 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.633333 - value: 449 + time: 3.4 + value: 366 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.4333334 + value: 336 + inSlope: -62.857075 + outSlope: -62.857075 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.8 + value: 278.0001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.1 + value: 278.0001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.366667 + value: 366 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -4236,7 +4398,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 2.9666667 + time: 2.4666667 value: -411 inSlope: 0 outSlope: 0 @@ -4245,7 +4407,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.3333333 + time: 2.8333333 value: -359.5001 inSlope: 0 outSlope: 0 @@ -4254,7 +4416,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.0333333 + time: 3.1333334 value: -359.5001 inSlope: 0 outSlope: 0 @@ -4263,8 +4425,44 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 5.633333 - value: -523 + time: 3.4 + value: -411 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.4333334 + value: -411 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.8 + value: -359.5001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.1 + value: -359.5001 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5.366667 + value: -411 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -4302,7 +4500,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 3.3333333 + time: 2.8333333 value: 1 inSlope: Infinity outSlope: Infinity @@ -4311,7 +4509,25 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 5.0333333 + time: 3.1333334 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 4.8 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 5.1 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Prefabs/UI/Tutorial.prefab b/Assets/Prefabs/UI/Tutorial.prefab index 7e0a167f..7d60f71d 100644 --- a/Assets/Prefabs/UI/Tutorial.prefab +++ b/Assets/Prefabs/UI/Tutorial.prefab @@ -242,7 +242,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1831065641766120066 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Settings/DivingMinigameSettings.asset b/Assets/Settings/DivingMinigameSettings.asset index fb4d6b08..e9b98845 100644 --- a/Assets/Settings/DivingMinigameSettings.asset +++ b/Assets/Settings/DivingMinigameSettings.asset @@ -76,7 +76,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - photoInputMode: 1 + photoInputMode: 0 paddingFactor: 1 minSizePercent: 0.15 maxSizePercent: 1