From b8b99e24035d9309e4fd4c5c0e0db52d38e06f61 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 22 十一月 2018 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/ClientVersion/VersionConfig.cs | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/System/ClientVersion/VersionConfig.cs b/System/ClientVersion/VersionConfig.cs
index dcfd176..bc19581 100644
--- a/System/ClientVersion/VersionConfig.cs
+++ b/System/ClientVersion/VersionConfig.cs
@@ -13,10 +13,30 @@
public const string VERSION_ALTERNATIVE = "1.2.0";
[SerializeField] public string m_AppId = string.Empty;
- public string appId { get { return m_AppId; } }
+ public string appId
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(SDKUtility.Yj_AppID))
+ {
+ return SDKUtility.Yj_AppID;
+ }
+ return m_AppId;
+ }
+ }
[SerializeField] public string m_SpID = string.Empty;
- public string SpID { get { return m_SpID; } }
+ public string SpID
+ {
+ get
+ {
+ if (!string.IsNullOrEmpty(SDKUtility.Yj_SpID))
+ {
+ return SDKUtility.Yj_SpID;
+ }
+ return m_SpID;
+ }
+ }
[SerializeField] VersionAuthority m_VersionAuthority;
public VersionAuthority versionAuthority { get { return m_VersionAuthority; } }
@@ -28,8 +48,10 @@
public string clientPackageFlag { get { return m_ClientPackageFlag; } }
[SerializeField] int m_Branch = 0;
- public int branch {
- get {
+ public int branch
+ {
+ get
+ {
if (DebugUtility.Instance.debugAccount && DebugUtility.Instance.debugBranch >= 0)
{
return DebugUtility.Instance.debugBranch;
@@ -69,25 +91,29 @@
public string appleDeveloperTeamID { get { return m_AppleDeveloperTeamID; } }
[SerializeField] bool m_DebugVersion = false;
- public bool debugVersion {
+ public bool debugVersion
+ {
get { return m_DebugVersion; }
set { m_DebugVersion = value; }
}
[SerializeField] bool m_IsBanShu = false;
- public bool isBanShu {
+ public bool isBanShu
+ {
get { return m_IsBanShu; }
set { m_IsBanShu = value; }
}
[SerializeField] string m_BuildTime;
- public string buildTime {
+ public string buildTime
+ {
get { return m_BuildTime; }
set { m_BuildTime = value; }
}
[SerializeField] int m_BuildIndex;
- public int buildIndex {
+ public int buildIndex
+ {
get { return m_BuildIndex; }
set { m_BuildIndex = value; }
}
--
Gitblit v1.8.0