From 5c70a5872042e3011b992715f6e1cce367a537ab Mon Sep 17 00:00:00 2001
From: client_Zxw <826696702@qq.com>
Date: 星期一, 08 十月 2018 14:44:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/ClientVersion/VersionUtility.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/System/ClientVersion/VersionUtility.cs b/System/ClientVersion/VersionUtility.cs
index 7e65b29..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()
@@ -289,6 +289,7 @@
var content = string.Empty;
if (textAsset != null)
{
+ content = textAsset.text;
if (DateTime.TryParse(content, out dateTime))
{
return DateTime.Now < dateTime;
@@ -309,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