Merge branch 'bugfix/问题修复' into 'develop'
Bugfix/问题修复 See merge request aibis-dream/aibis-dream!776
This commit is contained in:
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@@ -18,6 +18,8 @@
|
||||
Dream,
|
||||
MainMenu,
|
||||
Empty,
|
||||
PauseMenu
|
||||
PauseMenu,
|
||||
Sale = 17,
|
||||
Log = 18,
|
||||
}
|
||||
}
|
||||
@@ -487,6 +487,8 @@ namespace AibisDream.Kit
|
||||
FixSceneMode.UF => AmbState.UF,
|
||||
FixSceneMode.Eye => AmbState.Eye,
|
||||
FixSceneMode.Memory => AmbState.Memory,
|
||||
FixSceneMode.Sales => AmbState.Sale,
|
||||
FixSceneMode.AnalysisMode => AmbState.Log,
|
||||
_ => AmbState.Main
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
using System;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using AibisDream.Framework;
|
||||
using AibisDream.Kit;
|
||||
@@ -89,6 +89,7 @@ namespace AibisDream
|
||||
if (_spriteRenderer == null) yield break;
|
||||
_spriteRenderer.DOKill();
|
||||
_spriteRenderer.gameObject.SetActive(true);
|
||||
if (!CommonUtil.IsZero(duration)) _spriteRenderer.SetAlpha(0f);
|
||||
|
||||
var loaded = false;
|
||||
yield return LoadDreamSpriteInto(_spriteRenderer, picName, value => loaded = value);
|
||||
@@ -115,7 +116,7 @@ namespace AibisDream
|
||||
if (_largeSpriteRenderer == null) yield break;
|
||||
_largeSpriteRenderer.DOKill();
|
||||
_largeSpriteRenderer.gameObject.SetActive(true);
|
||||
_largeSpriteRenderer.SetAlpha(0f);
|
||||
if (!CommonUtil.IsZero(duration)) _largeSpriteRenderer.SetAlpha(0f);
|
||||
|
||||
var loaded = false;
|
||||
yield return LoadDreamSpriteInto(_largeSpriteRenderer, picName, value => loaded = value);
|
||||
@@ -126,7 +127,7 @@ namespace AibisDream
|
||||
}
|
||||
|
||||
_currentLargePicName = NormalizeDreamPicName(picName);
|
||||
if (duration <= 0f)
|
||||
if (CommonUtil.IsZero(duration))
|
||||
_largeSpriteRenderer.SetAlpha(1f);
|
||||
else
|
||||
yield return _largeSpriteRenderer.DOFade(1f, duration).WaitForCompletion();
|
||||
|
||||
Reference in New Issue
Block a user