From 9d772496e5357a582b4c3e31fea902a35e9dcbf3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 28 六月 2019 18:58:04 +0800
Subject: [PATCH] 7595 仙宝奇缘项目版本校验地址加入game参数

---
 System/ClientVersion/VersionConfig.cs |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/System/ClientVersion/VersionConfig.cs b/System/ClientVersion/VersionConfig.cs
index 6da5327..b9f0007 100644
--- a/System/ClientVersion/VersionConfig.cs
+++ b/System/ClientVersion/VersionConfig.cs
@@ -11,7 +11,7 @@
 [XLua.LuaCallCSharp]
 public class VersionConfig : ScriptableObject
 {
-    public const string VERSION_ALTERNATIVE = "0.0.0";
+    public const string VERSION_ALTERNATIVE = "1.100.1";
 
     [SerializeField] public string m_AppId = string.Empty;
     public string appId {
@@ -58,12 +58,20 @@
         }
     }
 
-    [SerializeField] string m_GameId = string.Empty;
+    string m_GameId = string.Empty;
     public string gameId {
         get {
             if (string.IsNullOrEmpty(m_GameId))
             {
-                return "xbqy";
+                var gameText = Resources.Load<TextAsset>("Game");
+                if (gameText != null)
+                {
+                    m_GameId = gameText.text;
+                }
+                else
+                {
+                    m_GameId = "xbqy";
+                }
             }
 
             return m_GameId;
@@ -145,7 +153,6 @@
             m_Version = dataStrings[4];
             m_ClientPackageFlag = dataStrings[5];
             m_Branch = int.Parse(dataStrings[6]);
-            m_GameId = dataStrings[7];
             m_AssetAccess = (InstalledAsset)int.Parse(dataStrings[8]);
             m_PartAssetPackage = int.Parse(dataStrings[9]) == 1;
             m_ProductName = dataStrings[10];
@@ -184,7 +191,6 @@
         _to.m_Version = _from.m_Version;
         _to.m_AppId = _from.m_AppId;
         _to.m_Branch = _from.m_Branch;
-        _to.m_GameId = _from.m_GameId;
         _to.m_AssetAccess = _from.m_AssetAccess;
         _to.m_PartAssetPackage = _from.m_PartAssetPackage;
         _to.m_BuildTime = _from.m_BuildTime;

--
Gitblit v1.8.0