|
@@ -4,6 +4,7 @@ using UI.Main;
|
|
using System.Collections;
|
|
using System.Collections;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Generic;
|
|
using System.Text.RegularExpressions;
|
|
using System.Text.RegularExpressions;
|
|
|
|
+using System;
|
|
|
|
|
|
namespace GFGGame
|
|
namespace GFGGame
|
|
{
|
|
{
|
|
@@ -36,6 +37,9 @@ namespace GFGGame
|
|
private string _currentWords;
|
|
private string _currentWords;
|
|
private string _stroyStartID;
|
|
private string _stroyStartID;
|
|
|
|
|
|
|
|
+ //ÆÁĻЧ¹ûÖÐ
|
|
|
|
+ private Action<object> _onScreenEffectComplete;
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
public override void Dispose()
|
|
public override void Dispose()
|
|
@@ -54,7 +58,7 @@ namespace GFGGame
|
|
_arrow = null;
|
|
_arrow = null;
|
|
_isShowLetters = false;
|
|
_isShowLetters = false;
|
|
SceneController.DestroyObjectFromView(_npcHead, _npcWrapper);
|
|
SceneController.DestroyObjectFromView(_npcHead, _npcWrapper);
|
|
-
|
|
|
|
|
|
+ _onScreenEffectComplete = null;
|
|
Timers.inst.Remove(UpdateLetters);
|
|
Timers.inst.Remove(UpdateLetters);
|
|
if (_ui != null)
|
|
if (_ui != null)
|
|
{
|
|
{
|
|
@@ -177,7 +181,15 @@ namespace GFGGame
|
|
private void OnClickBtnNext()
|
|
private void OnClickBtnNext()
|
|
{
|
|
{
|
|
// StopAutoPlay();
|
|
// StopAutoPlay();
|
|
- ShowNextWords();
|
|
|
|
|
|
+ if(_onScreenEffectComplete != null)
|
|
|
|
+ {
|
|
|
|
+ Timers.inst.Remove(OnScreenEffectComplete);
|
|
|
|
+ _onScreenEffectComplete.Invoke(null);
|
|
|
|
+ }
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ ShowNextWords();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
private void OnClickBtnLookBack()
|
|
private void OnClickBtnLookBack()
|
|
@@ -285,6 +297,7 @@ namespace GFGGame
|
|
{
|
|
{
|
|
//ת»»³ÉÃë
|
|
//ת»»³ÉÃë
|
|
delay = delay / 1000f;
|
|
delay = delay / 1000f;
|
|
|
|
+ _onScreenEffectComplete = OnScreenEffectComplete;
|
|
Timers.inst.Add(delay, 1, OnScreenEffectComplete);
|
|
Timers.inst.Add(delay, 1, OnScreenEffectComplete);
|
|
}
|
|
}
|
|
else
|
|
else
|
|
@@ -295,6 +308,7 @@ namespace GFGGame
|
|
|
|
|
|
private void OnScreenEffectComplete(object param = null)
|
|
private void OnScreenEffectComplete(object param = null)
|
|
{
|
|
{
|
|
|
|
+ _onScreenEffectComplete = null;
|
|
if (_nextStepId == "0")
|
|
if (_nextStepId == "0")
|
|
{
|
|
{
|
|
Over();
|
|
Over();
|