From 703337574c8d4d4e852ea90c778e3aff3523ce12 Mon Sep 17 00:00:00 2001
From: client_linchunjie <461730578@qq.com>
Date: 星期三, 26 九月 2018 15:12:31 +0800
Subject: [PATCH] Merge branch 'master' into 1871天赋功能

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

diff --git a/System/ClientVersion/VersionConfig.cs b/System/ClientVersion/VersionConfig.cs
index b8875c7..9b45803 100644
--- a/System/ClientVersion/VersionConfig.cs
+++ b/System/ClientVersion/VersionConfig.cs
@@ -92,6 +92,9 @@
     [SerializeField] Vector2 m_LogoPosition;
     public Vector2 logoPosition { get { return m_LogoPosition; } }
 
+    [SerializeField] string m_BanHao;
+    public string banHao { get { return m_BanHao; } }
+
     public void Read(string _data)
     {
         var dataStrings = _data.Split('\t');
@@ -112,6 +115,7 @@
         m_DebugVersion = int.Parse(dataStrings[16]) == 1;
         m_IsBanShu = int.Parse(dataStrings[17]) == 1;
         m_LogoPosition = dataStrings[18].Vector3Parse();
+        m_BanHao = dataStrings[19];
     }
 
 #if UNITY_EDITOR
@@ -165,6 +169,7 @@
         _to.m_IsBanShu = _from.m_IsBanShu;
         _to.m_ClientPackageFlag = _from.m_ClientPackageFlag;
         _to.m_LogoPosition = _from.m_LogoPosition;
+        _to.m_BanHao = _from.m_BanHao;
     }
 
     /// <summary>

--
Gitblit v1.8.0