From 8b9063454ea8cbc5a0101b1624ae3b6b50ecb40c Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期一, 08 十月 2018 11:04:43 +0800
Subject: [PATCH] 4019 【前端】公告显示时机调整
---
Core/GameEngine/Login/Launch.cs | 2 ++
System/AssetVersion/DownLoadAndDiscompressTask.cs | 2 ++
System/Login/GameNotice.cs | 25 +++++++++++++++++--------
3 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/Core/GameEngine/Login/Launch.cs b/Core/GameEngine/Login/Launch.cs
index fa55a36..877aa4e 100644
--- a/Core/GameEngine/Login/Launch.cs
+++ b/Core/GameEngine/Login/Launch.cs
@@ -263,6 +263,8 @@
}
}
+ GameNotice.OpenGameNotice();
+
if (!AssetSource.allFromEditor)
{
StartCoroutine(AssetBundleUtility.Instance.Initialize());
diff --git a/System/AssetVersion/DownLoadAndDiscompressTask.cs b/System/AssetVersion/DownLoadAndDiscompressTask.cs
index 92ecb87..5674971 100644
--- a/System/AssetVersion/DownLoadAndDiscompressTask.cs
+++ b/System/AssetVersion/DownLoadAndDiscompressTask.cs
@@ -78,6 +78,8 @@
{
step = Step.DownLoad;
SnxxzGame.Instance.StartCoroutine(Co_StartDownLoad());
+
+ GameNotice.OpenGameNotice();
}
IEnumerator Co_StartDownLoad()
diff --git a/System/Login/GameNotice.cs b/System/Login/GameNotice.cs
index 1f7dd8d..6542325 100644
--- a/System/Login/GameNotice.cs
+++ b/System/Login/GameNotice.cs
@@ -11,7 +11,12 @@
#if !UNITY_EDITOR
try
{
- var url = VersionUtility.Instance.versionInfo.GetNoticeURL(VersionConfig.Get().branch);
+ var url = string.Empty;
+ if (VersionUtility.Instance.versionInfo != null)
+ {
+ url = VersionUtility.Instance.versionInfo.GetNoticeURL(VersionConfig.Get().branch);
+ }
+
if (!string.IsNullOrEmpty(url) && !noticeShowed)
{
SDKUtility.Instance.OpenUrl(url);
@@ -52,18 +57,22 @@
public static void OpenGameNoticeForce()
{
#if !UNITY_EDITOR
- try
+ try
{
- var url = VersionUtility.Instance.versionInfo.GetNoticeURL(VersionConfig.Get().branch);
+ var url = string.Empty;
+ if (VersionUtility.Instance.versionInfo != null)
+ {
+ url = VersionUtility.Instance.versionInfo.GetNoticeURL(VersionConfig.Get().branch);
+ }
if (!string.IsNullOrEmpty(url))
{
SDKUtility.Instance.OpenUrl(url);
}
- }
- catch (System.Exception ex)
- {
- Debug.Log(ex);
- }
+ }
+ catch (System.Exception ex)
+ {
+ Debug.Log(ex);
+ }
#endif
}
--
Gitblit v1.8.0