foldcc/XCharts
1
0
Fork 0
mirror of https://github.com/XCharts-Team/XCharts.git synced 2026-05-26 02:40:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

增加AnimationHiding隐藏动画

Browse Source
This commit is contained in:
monitor1394
2023-07-28 08:08:49 +08:00
parent fc7655fd76
commit f867ac7efd
3 changed files with 37 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Runtime/Component/Animation/AnimationInfo.cs
View File

@@ -404,6 +404,16 @@ namespace XCharts.Runtime
{ {
} }
/// <summary>
/// Data hiding animation.
/// |数据隐藏动画。
/// </summary>
[Since("v3.8.0")]
[System.Serializable]
public class AnimationHiding : AnimationInfo
{
}
/// <summary> /// <summary>
/// Interactive animation of charts. /// Interactive animation of charts.
/// |交互动画。 /// |交互动画。

14
Runtime/Component/Animation/AnimationStyle.cs
View File

@@ -60,6 +60,7 @@ namespace XCharts.Runtime
[SerializeField][Since("v3.8.0")] private AnimationFadeOut m_FadeOut = new AnimationFadeOut() { reverse = true }; [SerializeField][Since("v3.8.0")] private AnimationFadeOut m_FadeOut = new AnimationFadeOut() { reverse = true };
[SerializeField][Since("v3.8.0")] private AnimationChange m_Change = new AnimationChange() { duration = 500 }; [SerializeField][Since("v3.8.0")] private AnimationChange m_Change = new AnimationChange() { duration = 500 };
[SerializeField][Since("v3.8.0")] private AnimationAddition m_Addition = new AnimationAddition() { duration = 500 }; [SerializeField][Since("v3.8.0")] private AnimationAddition m_Addition = new AnimationAddition() { duration = 500 };
[SerializeField][Since("v3.8.0")] private AnimationHiding m_Hiding = new AnimationHiding() { duration = 500 };
[SerializeField][Since("v3.8.0")] private AnimationInteraction m_Interaction = new AnimationInteraction() { duration = 250 }; [SerializeField][Since("v3.8.0")] private AnimationInteraction m_Interaction = new AnimationInteraction() { duration = 250 };
[Obsolete("Use animation.fadeIn.delayFunction instead.", true)] [Obsolete("Use animation.fadeIn.delayFunction instead.", true)]
@@ -117,6 +118,12 @@ namespace XCharts.Runtime
/// </summary> /// </summary>
public AnimationAddition addition { get { return m_Addition; } } public AnimationAddition addition { get { return m_Addition; } }
/// <summary> /// <summary>
/// Data hiding animation configuration.
/// |数据隐藏动画配置。
/// </summary>
/// <value></value>
public AnimationHiding hiding { get { return m_Hiding; } }
/// <summary>
/// Interaction animation configuration. /// Interaction animation configuration.
/// |交互动画配置。 /// |交互动画配置。
/// </summary> /// </summary>
@@ -135,6 +142,7 @@ namespace XCharts.Runtime
m_Animations.Add(m_FadeOut); m_Animations.Add(m_FadeOut);
m_Animations.Add(m_Change); m_Animations.Add(m_Change);
m_Animations.Add(m_Addition); m_Animations.Add(m_Addition);
m_Animations.Add(m_Hiding);
} }
return m_Animations; return m_Animations;
} }
@@ -560,5 +568,11 @@ namespace XCharts.Runtime
{ {
return enable && m_FadeOut.context.start; return enable && m_FadeOut.context.start;
} }
public bool CanCheckInteract()
{
return enable && interaction.enable
&& !IsFadeIn() && !IsFadeOut();
}
} }
} }

13
Runtime/Component/Interaction/InteractData.cs
View File

@@ -52,6 +52,19 @@ namespace XCharts.Runtime
} }
} }
public void SetValue(float value)
{
if (m_TargetValue != value)
{
if (!m_ValueEnable)
m_PreviousValue = value;
else
m_PreviousValue = m_CurrentValue;
UpdateStart();
m_TargetValue = value;
}
}
public void SetPosition(ref bool needInteract, Vector3 pos) public void SetPosition(ref bool needInteract, Vector3 pos)
{ {
if (m_TargetPosition != pos) if (m_TargetPosition != pos)