浏览代码

fixed bug with fading out second animation allowing it to get to a stuck state if the goal was reached too early

/main
Dan 4 年前
当前提交
bf43f335
共有 4 个文件被更改,包括 13 次插入4 次删除
  1. 10
      Assets/UX/Scenes/UXManagerScene.unity
  2. 3
      Assets/UX/Scripts/ARUXAnimationManager.cs
  3. 2
      Assets/UX/Scripts/UIManager.cs
  4. 2
      ProjectSettings/EditorBuildSettings.asset

10
Assets/UX/Scenes/UXManagerScene.unity


propertyPath: m_CoachingOverlay
value:
objectReference: {fileID: 427002221}
- target: {fileID: 5977163238016480456, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
type: 3}
propertyPath: m_FadeOffDuration
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5977163238016480456, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
type: 3}
propertyPath: m_FadeOnDuration
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5977163238016480458, guid: 29251f2f7c5044cce8e7eb862b4d93ef,
type: 3}
propertyPath: m_ARSessionOrigin

3
Assets/UX/Scripts/ARUXAnimationManager.cs


m_StartColor = m_AlphaWhite;
m_TargetColor = m_White;
m_TweenDuration = m_FadeOnDuration;
m_FadeOff = false;
}

if (m_VideoPlayer.clip != null)
{
// handle exiting fade out early if currently fading out another Clip
if (m_Tweening)
if (m_Tweening || m_FadeOn)
{
// stop tween immediately
m_TweenTime = 1.0f;

2
Assets/UX/Scripts/UIManager.cs


// if goal reached, fade off
if (!m_FadedOff)
{
m_AnimationManager.FadeOffCurrentUI();
m_AnimationManager.FadeOffCurrentUI();
}
}
}

2
ProjectSettings/EditorBuildSettings.asset


serializedVersion: 2
m_Scenes:
- enabled: 0
path: Assets/ARFoundationDemos/ImageTracking/Scenes/ImageTracking.unity
path: Assets/ImageTracking/Scenes/ImageTracking.unity
guid: 90c9c5e58ea6f4125979d49ff7533aee
- enabled: 1
path: Assets/UX/Scenes/UXManagerScene.unity

正在加载...
取消
保存