From 0012445c0109fa67987800a1bac8f32e989b2d19 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 15 八月 2018 15:16:01 +0800
Subject: [PATCH] Merge branch 'master' into leonard
---
System/AssetVersion/InGameDownLoadProgress.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/System/AssetVersion/InGameDownLoadProgress.cs b/System/AssetVersion/InGameDownLoadProgress.cs
index 3b6a745..ee0140d 100644
--- a/System/AssetVersion/InGameDownLoadProgress.cs
+++ b/System/AssetVersion/InGameDownLoadProgress.cs
@@ -18,7 +18,7 @@
private void Awake()
{
- if (InGameDownLoad.Instance.dominantDownLoadStarted
+ if (InGameDownLoad.Instance.dominantState != InGameDownLoad.Dominant.None
&& InGameDownLoad.Instance.state != InGameDownLoad.State.Completed)
{
this.gameObject.SetActive(true);
@@ -36,7 +36,7 @@
}
InGameDownLoad.Instance.downLoadStateChangeEvent += OnDownLoadStateChange;
- InGameDownLoad.Instance.dominantDownLoadEvent += OnDominantDownLoadStarted;
+ InGameDownLoad.Instance.dominantDownLoadEvent += OnDownLoadDominantStateChange;
m_ViewDownLoad.AddListener(OpenInGameDownloadWin);
}
@@ -55,13 +55,13 @@
{
m_ViewDownLoad.RemoveAllListeners();
InGameDownLoad.Instance.downLoadStateChangeEvent -= OnDownLoadStateChange;
- InGameDownLoad.Instance.dominantDownLoadEvent -= OnDominantDownLoadStarted;
+ InGameDownLoad.Instance.dominantDownLoadEvent -= OnDownLoadDominantStateChange;
}
- private void OnDominantDownLoadStarted()
+ private void OnDownLoadDominantStateChange(InGameDownLoad.Dominant _dominant)
{
UpdateDownLoadProgress();
- this.gameObject.SetActive(InGameDownLoad.Instance.dominantDownLoadStarted);
+ this.gameObject.SetActive(InGameDownLoad.Instance.dominantState != InGameDownLoad.Dominant.None);
}
private void OnDownLoadStateChange(InGameDownLoad.State _step)
@@ -75,7 +75,7 @@
case InGameDownLoad.State.None:
case InGameDownLoad.State.Prepared:
case InGameDownLoad.State.DownLoad:
- if (InGameDownLoad.Instance.dominantDownLoadStarted)
+ if (InGameDownLoad.Instance.dominantState != InGameDownLoad.Dominant.None)
{
UpdateDownLoadProgress();
this.gameObject.SetActive(true);
@@ -118,7 +118,7 @@
case InGameDownLoad.State.None:
case InGameDownLoad.State.Pause:
case InGameDownLoad.State.Prepared:
- InGameDownLoad.Instance.TryDownLoad(true);
+ WindowCenter.Instance.Open<InGameDownLoadWin>();
break;
case InGameDownLoad.State.Award:
WindowCenter.Instance.Open<InGameDownLoadWin>();
--
Gitblit v1.8.0