From 9506bb33048bec53e38d6b39bd29dfb9f69f3ae0 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期五, 09 十一月 2018 15:43:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/DialogueDuidanceWin.cs | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/System/MainInterfacePanel/DialogueDuidanceWin.cs b/System/MainInterfacePanel/DialogueDuidanceWin.cs
index 7abe971..ec4b913 100644
--- a/System/MainInterfacePanel/DialogueDuidanceWin.cs
+++ b/System/MainInterfacePanel/DialogueDuidanceWin.cs
@@ -28,6 +28,7 @@
[SerializeField] Text m_PlayerNameText;
[SerializeField] Text m_ContentText;
+ [SerializeField] Text m_NextText;
[SerializeField] List<int> MysteriousTaskID = new List<int>();//鏂版坊绁炵浠诲姟
Dictionary<int, string> PlayerIcon = new Dictionary<int, string>();
private int storyMissionsID = 0;//鍓ф儏浠诲姟ID
@@ -35,6 +36,8 @@
private int[] sPeaker;//瀵硅瘽瀵瑰簲鍗婅韩鍍忥紙0涓轰富瑙�/1涓篘PC锛�
private int nowTaskNum = 0;//鑾峰彇褰撳墠鐨勪换鍔�
private int typesPeaker = -1;
+
+ private float timeType = 0f;
PlayerTaskDatas m_TaskModel;
PlayerTaskDatas taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<PlayerTaskDatas>()); } }
@@ -70,6 +73,8 @@
protected override void OnPreOpen()
{
MainInterfaceWin.IsOpenMaininterface += IsOpenMaininterface;
+ timeType = 0;
+ m_NextText.text = string.Format(Language.Get("TaskContinueCount"), AwaitSecond);
IsCloseWindow();
typesPeaker = -1;
storyMissionsID = taskmodel._TaskNow;
@@ -114,35 +119,35 @@
protected override void OnAfterOpen()
{
- Treasure treasure = null;
- if (treasureModel.TryGetTreasure(FabaoId, out treasure))
- {
- if (treasure.state != TreasureState.Collecting && !NewBieCenter.Instance.inGuiding)
- {
- StartCoroutine("GetMainSelfMotion");
- }
+ //Treasure treasure = null;
+ //if (treasureModel.TryGetTreasure(FabaoId, out treasure))
+ //{
+ // if (treasure.state != TreasureState.Collecting && !NewBieCenter.Instance.inGuiding)
+ // {
+ // StartCoroutine("GetMainSelfMotion");
+ // }
- }
+ //}
}
- IEnumerator GetMainSelfMotion()
- {
- if (mainModel.IsSelfMotionTask)
- {
- yield return WaitingForSecondConst.WaitMS1500;
- }
- else
- {
- yield return new WaitForSeconds(AwaitSecond);
- }
- OnClickSKIPButton();
- mainModel.IsSelfMotionTask = true;
- yield break;
- }
+ //IEnumerator GetMainSelfMotion()
+ //{
+ // if (mainModel.IsSelfMotionTask)
+ // {
+ // yield return WaitingForSecondConst.WaitMS1500;
+ // }
+ // else
+ // {
+ // yield return new WaitForSeconds(AwaitSecond);
+ // }
+ // OnClickSKIPButton();
+ // mainModel.IsSelfMotionTask = true;
+ // yield break;
+ //}
protected override void OnPreClose()
{
MainInterfaceWin.IsOpenMaininterface -= IsOpenMaininterface;
UI3DModelExhibition.Instance.StopShow();
- StopCoroutine("GetMainSelfMotion");
+ // StopCoroutine("GetMainSelfMotion");
}
private void IsOpenMaininterface()
@@ -169,7 +174,17 @@
}
protected override void LateUpdate()
{
- base.LateUpdate();
+ timeType += Time.deltaTime;
+ if (timeType >= AwaitSecond)
+ {
+ m_NextText.text = string.Format(Language.Get("TaskContinueCount"), 0);
+ OnClickSKIPButton();
+ mainModel.IsSelfMotionTask = true;
+ }
+ else
+ {
+ m_NextText.text= string.Format(Language.Get("TaskContinueCount"), AwaitSecond - (int)timeType);
+ }
if (this is BossShowDialogueWin)
{
@@ -204,6 +219,7 @@
}
private void OnClickMarkRay()
{
+ timeType = 0;
var config = Config.Instance.Get<StoryMissionsConfig>(storyMissionsID);
if (config == null)
{
--
Gitblit v1.8.0