From 31c2cebbccba45a00a755981dd6d0cdd0a0459e9 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期二, 14 八月 2018 17:28:38 +0800
Subject: [PATCH] Merge branch 'master' into leonard

---
 Assets/Resources/ScriptableObject/Config/VersionConfig.asset |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Assets/Resources/ScriptableObject/Config/VersionConfig.asset b/Assets/Resources/ScriptableObject/Config/VersionConfig.asset
index 08163a2..f00115c 100644
--- a/Assets/Resources/ScriptableObject/Config/VersionConfig.asset
+++ b/Assets/Resources/ScriptableObject/Config/VersionConfig.asset
@@ -11,19 +11,22 @@
   m_Script: {fileID: 11500000, guid: 13959b6aa2c3f5745af1c3f65a400302, type: 3}
   m_Name: VersionConfig
   m_EditorClassIdentifier: 
+  m_AppId: test
   m_VersionAuthority: 0
   m_Version: 10.1000.1
-  m_AppId: test
+  m_ClientPackageFlag: aaa
   m_Branch: 0
   m_AssetAccess: 3
-  m_ProductName: "\u5C11\u5E74\u5947\u4FA0\u4F20"
+  m_PartAssetPackage: 0
+  m_ProductName: "\u5C11\u5E74\u4FEE\u4ED9\u4F20"
   m_BundleIdentifier: com.secondworld.snxxz
   m_KeystoreFileName: thesecondworld
   m_KeystorePassword: thesecondworld2018
   m_KeystoreAlias: thesecondworld
   m_KeystoreAliasPassword: thesecondworld2018
   m_AppleDeveloperTeamID: 
-  m_BuildTime: 18/05/22--20:55
-  m_BuildIndex: 111
   m_DebugVersion: 1
   m_IsBanShu: 0
+  m_BuildTime: 18/08/06--16:39
+  m_BuildIndex: 100
+  m_LogoPosition: {x: -15, y: 64}

--
Gitblit v1.8.0