From 9ebce98cec332c4d78e7ebaff7ca844cd666383f Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 08 十月 2018 10:33:58 +0800
Subject: [PATCH] 3335 ios打包添加appstore审核期限，在这个期限内，不访问后台
---
Fight/Stage/CreateRoleStage.cs | 2
System/AssetVersion/AssetVersionUtility.cs | 49 ++++------------
Core/GameEngine/Login/LoginStage.cs | 2
Core/GameEngine/Login/Launch.cs | 55 +++++++----------
Fight/Stage/SelectRoleStage.cs | 2
System/ClientVersion/VersionUtility.cs | 16 ++++
6 files changed, 53 insertions(+), 73 deletions(-)
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index bb44367..fa55a36 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -231,44 +231,35 @@
OperationLogCollect.Instance.RecordLauchEvent(2);
OperationLogCollect.Instance.RecordEvent(2);
- if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 1)
+ if (VersionUtility.Instance.NeedDownAsset())
{
m_CurrentStage = LaunchStage.DownLoad;
- switch (VersionConfig.Get().assetAccess)
+ progressBuf = progress;
+ timer = 0f;
+ duration = 1.5f;
+
+ AssetVersionUtility.GetAssetVersionFile();
+ while (!AssetVersionUtility.checkAssetCompleted)
{
- case InstalledAsset.IngoreDownLoad:
- break;
- case InstalledAsset.NullAsset:
- case InstalledAsset.HalfAsset:
- case InstalledAsset.FullAsset:
- AssetVersionUtility.GetAssetVersionFile();
+ timer += Time.deltaTime;
+ progress = Mathf.Clamp(progressBuf + timer / duration * 0.3f, progressBuf, progressBuf + 0.3f);
+ yield return null;
+ }
- progressBuf = progress;
- timer = 0f;
- duration = 1.5f;
- while (!AssetVersionUtility.checkAssetCompleted)
- {
- timer += Time.deltaTime;
- progress = Mathf.Clamp(progressBuf + timer / duration * 0.3f, progressBuf, progressBuf + 0.3f);
- yield return null;
- }
+ if (!AssetVersionUtility.priorAssetDownLoadDone)
+ {
+ AssetVersionUtility.BeginDownLoadTask(true);
+ while (!AssetVersionUtility.priorAssetDownLoadDone)
+ {
+ yield return null;
+ }
- if (!AssetVersionUtility.priorAssetDownLoadDone)
- {
- AssetVersionUtility.BeginDownLoadTask(true);
- while (!AssetVersionUtility.priorAssetDownLoadDone)
- {
- yield return null;
- }
+ yield return WaitingForSecondConst.WaitMS200;
+ }
- yield return WaitingForSecondConst.WaitMS200;
- }
-
- if (!AssetVersionUtility.unPriorAssetDownLoadDone)
- {
- AssetVersionUtility.BeginDownLoadTask(false);
- }
- break;
+ if (!AssetVersionUtility.unPriorAssetDownLoadDone)
+ {
+ AssetVersionUtility.BeginDownLoadTask(false);
}
}
diff --git a/Core/GameEngine/Login/LoginStage.cs b/Core/GameEngine/Login/LoginStage.cs
index 9b767ac..a0218f3 100644
--- a/Core/GameEngine/Login/LoginStage.cs
+++ b/Core/GameEngine/Login/LoginStage.cs
@@ -52,7 +52,7 @@
SoundPlayer.Instance.PlayLoginMusic();
- if (!AssetVersionUtility.hasDownLoadFullAsset)
+ if (VersionUtility.Instance.NeedDownAsset() && !AssetVersionUtility.hasDownLoadFullAsset)
{
InGameDownLoad.Instance.inGameDownLoadAllow = true;
InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.None);
diff --git a/Fight/Stage/CreateRoleStage.cs b/Fight/Stage/CreateRoleStage.cs
index 5794f68..e99be57 100644
--- a/Fight/Stage/CreateRoleStage.cs
+++ b/Fight/Stage/CreateRoleStage.cs
@@ -22,7 +22,7 @@
SystemSetting.Instance.SetQualityLevel(SystemSetting.Instance.GetCurrentQualityLevel());
SoundPlayer.Instance.PlayLoginMusic();
- if (!AssetVersionUtility.hasDownLoadFullAsset)
+ if (VersionUtility.Instance.NeedDownAsset() && !AssetVersionUtility.hasDownLoadFullAsset)
{
InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.None);
}
diff --git a/Fight/Stage/SelectRoleStage.cs b/Fight/Stage/SelectRoleStage.cs
index 34e15a9..a178287 100644
--- a/Fight/Stage/SelectRoleStage.cs
+++ b/Fight/Stage/SelectRoleStage.cs
@@ -20,7 +20,7 @@
SystemSetting.Instance.SetQualityLevel(SystemSetting.Instance.GetCurrentQualityLevel());
SoundPlayer.Instance.PlayLoginMusic();
- if (!AssetVersionUtility.hasDownLoadFullAsset)
+ if (VersionUtility.Instance.NeedDownAsset() && !AssetVersionUtility.hasDownLoadFullAsset)
{
InGameDownLoad.Instance.TryDownLoad(InGameDownLoad.Dominant.None);
}
diff --git a/System/AssetVersion/AssetVersionUtility.cs b/System/AssetVersion/AssetVersionUtility.cs
index dae6980..20ab77b 100644
--- a/System/AssetVersion/AssetVersionUtility.cs
+++ b/System/AssetVersion/AssetVersionUtility.cs
@@ -18,23 +18,13 @@
static bool m_PriorAssetDownLoadDone = false;
public static bool priorAssetDownLoadDone {
get {
- if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
+ if (VersionUtility.Instance.NeedDownAsset())
+ {
+ return m_PriorAssetDownLoadDone;
+ }
+ else
{
return true;
- }
- else
- {
- switch (VersionConfig.Get().assetAccess)
- {
- case InstalledAsset.NullAsset:
- case InstalledAsset.HalfAsset:
- case InstalledAsset.FullAsset:
- return m_PriorAssetDownLoadDone;
- case InstalledAsset.IngoreDownLoad:
- return true;
- default:
- return true;
- }
}
}
}
@@ -42,23 +32,13 @@
static bool m_UnPriorAssetDownLoadDone = false;
public static bool unPriorAssetDownLoadDone {
get {
- if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
+ if (VersionUtility.Instance.NeedDownAsset())
+ {
+ return m_UnPriorAssetDownLoadDone;
+ }
+ else
{
return true;
- }
- else
- {
- switch (VersionConfig.Get().assetAccess)
- {
- case InstalledAsset.NullAsset:
- case InstalledAsset.HalfAsset:
- case InstalledAsset.FullAsset:
- return m_UnPriorAssetDownLoadDone;
- case InstalledAsset.IngoreDownLoad:
- return true;
- default:
- return true;
- }
}
}
}
@@ -201,17 +181,14 @@
public static bool IsUnpriorAssetDownLoadOk()
{
- if (VersionUtility.Instance.versionInfo != null && VersionUtility.Instance.versionInfo.downAsset == 0)
+ if (VersionUtility.Instance.NeedDownAsset() )
{
- return true;
+ return unPriorAssetDownLoadDone;
}
-
- if (VersionConfig.Get().assetAccess == InstalledAsset.IngoreDownLoad)
+ else
{
return true;
}
-
- return unPriorAssetDownLoadDone;
}
diff --git a/System/ClientVersion/VersionUtility.cs b/System/ClientVersion/VersionUtility.cs
index 2ee7af0..594af3e 100644
--- a/System/ClientVersion/VersionUtility.cs
+++ b/System/ClientVersion/VersionUtility.cs
@@ -115,7 +115,7 @@
{
if (IsMaoErGame())
{
- return versionInfo.downAsset == 0 && versionInfo.VersionCount > 0;
+ return versionInfo != null && versionInfo.downAsset == 0 && versionInfo.VersionCount > 0;
}
else
{
@@ -125,7 +125,7 @@
public bool NeedNormalUpdate()
{
- return versionInfo.downAsset == 1 && versionInfo.VersionCount > 0;
+ return versionInfo != null && versionInfo.downAsset == 1 && versionInfo.VersionCount > 0;
}
public string GetApkLocalUrl()
@@ -310,6 +310,18 @@
}
}
+ public bool NeedDownAsset()
+ {
+ if (versionInfo != null && versionInfo.downAsset == 1 && VersionConfig.Get().assetAccess != InstalledAsset.IngoreDownLoad)
+ {
+ return true;
+ }
+ else
+ {
+ return false;
+ }
+ }
+
public class VersionInfo
{
public int ForceCount;
--
Gitblit v1.8.0