Merge branch 'feature/章节管理' into feature/章节管理合入
This commit is contained in:
@@ -237,11 +237,12 @@ namespace AibisDream
|
||||
|
||||
#endregion
|
||||
|
||||
public IEnumerator NextSceneSo()
|
||||
public IEnumerator NextSceneSo(string exitName = null)
|
||||
{
|
||||
if (_currentTalkSceneSo.Value && _currentTalkSceneSo.Value.nextScene)
|
||||
var next = _currentTalkSceneSo.Value?.GetNextScene(exitName);
|
||||
if (next != null)
|
||||
{
|
||||
_currentTalkSceneSo.Value = _currentTalkSceneSo.Value.nextScene;
|
||||
_currentTalkSceneSo.Value = next;
|
||||
ChapterController.Instance.UnlockChapter(_currentTalkSceneSo.Value);
|
||||
yield return UIManager.Instance.GetPanel<PlayToolPanel>().FadeInAsync();
|
||||
yield return SceneLoader.Instance.LoadSceneAsync(_currentTalkSceneSo.Value.firstSceneName);
|
||||
@@ -249,11 +250,13 @@ namespace AibisDream
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log($"没有下个场景了 (exitName: {exitName})");
|
||||
yield return null;
|
||||
Debug.Log("没有下个场景了");
|
||||
}
|
||||
}
|
||||
|
||||
public TalkSceneSO[] GetAllSceneSos() => _totalSceneSos;
|
||||
|
||||
public void SetSceneSoByName(string soName)
|
||||
{
|
||||
_currentTalkSceneSo.Value = Array.Find(_totalSceneSos, so => so.name == soName);
|
||||
|
||||
Reference in New Issue
Block a user