修复两个Bug

Assets/Plugins/UnityPurchasing/Bin/Facebook/live/FacebookStore.dll.meta

@@ -1,79 +1,25 @@
 fileFormatVersion: 2
 guid: 97e43e86f5dfe4cb4a0eeee600af6b43
-timeCreated: 1473188568
+timeCreated: 1513086172
 licenseType: Pro
 PluginImporter:
   serializedVersion: 1
   iconMap: {}
   executionOrder: {}
   isPreloaded: 0
+  isOverridable: 0
   platformData:
-    Android:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
     Any:
       enabled: 0
       settings: {}
     Editor:
       enabled: 0
       settings:
-        CPU: AnyCPU
         DefaultValueInitialized: true
-        OS: AnyOS
-    Linux:
-      enabled: 0
-      settings:
-        CPU: None
-    Linux64:
-      enabled: 0
-      settings:
-        CPU: None
-    LinuxUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXIntel64:
-      enabled: 0
-      settings:
-        CPU: None
-    OSXUniversal:
-      enabled: 0
-      settings:
-        CPU: None
-    SamsungTV:
-      enabled: 0
-      settings:
-        STV_MODEL: STANDARD_13
-    WebGL:
-      enabled: 0
-      settings: {}
-    Win:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
-    Win64:
-      enabled: 0
-      settings:
-        CPU: AnyCPU
     WindowsStoreApps:
       enabled: 0
       settings:
         CPU: AnyCPU
-    iOS:
-      enabled: 0
-      settings:
-        CompileFlags: 
-        FrameworkDependencies: 
-    tvOS:
-      enabled: 0
-      settings:
-        CompileFlags: 
-        FrameworkDependencies: 
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Assets/Resource/Logo.unity

@@ -613,10 +613,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   AuditEdition: 1
-  DebugMode: 1
+  DebugMode: 0
   CatchException: 1
-  DebugModeGo: {fileID: 1264531325540048, guid: b22fd2d9abc702d43ac62a412537d4e9,
-    type: 2}
+  DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:
   m_ObjectHideFlags: 0

Assets/Script/Manage/ConfigManager.cs

@@ -206,7 +206,7 @@ public class ConfigManager : Regist
     }
 
 
-    private float MaxUrlWaitTime = 30;
+    private float MaxUrlWaitTime = 10;
     public void Update()
     {
         if (PlayerDocumentDamageFlag)

Assets/Script/Manage/Initializer.cs

@@ -325,6 +325,7 @@ public class Initializer : MonoBehaviour
 
         if (HttpManager.IsAnnounceReady)
         {
+            ResourceManager.SetActive(CanvasLabel.C_NotifyParent, true);
             ResourceManager.Get(CanvasLabel.C_Notify).TweenForCG();
         }
 
@@ -400,11 +401,11 @@ public class Initializer : MonoBehaviour
         }
 
         ResourceManager.SetText(CanvasLabel.U_WarningTitle, Language.GetStr(LanguageLabel.UI__U_WarningTitle, language));
-        if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseSimplified)
+        if (language == SystemLanguage.ChineseSimplified)
         {
             ResourceManager.SetText(CanvasLabel.U_WarningText, Language.GetStr(LanguageLabel.UI__U_WarningText, language));
         }
-        else if (LanguageManager.CurrentLanguage == CurrentLanguage.ChineseTraditional)
+        else if (language == SystemLanguage.ChineseTraditional)
         {
             ResourceManager.SetActive(CanvasLabel.U_WarningText, false);
         }

Assets/Script/Tool/DashGame/Language.cs

@@ -27,8 +27,43 @@ public class Language
 	public static string lan = SystemLanguage.English.ToString();
     public static string lanForUI = SystemLanguage.English.ToString();
 
-    public static Dictionary<CurrentLanguage, TextAsset> LanguageDic = new Dictionary<CurrentLanguage, TextAsset>();
-    public static Dictionary<CurrentLanguage, XmlDocument> XmlDocumentDictionary = new Dictionary<CurrentLanguage, XmlDocument>();
+    public static Dictionary<CurrentLanguage, TextAsset> LanguageDic
+    {
+        get
+        {
+            if (languageDic == null)
+            {
+                languageDic = new Dictionary<CurrentLanguage, TextAsset>();
+                languageDic.Add(CurrentLanguage.English, ResourceManager.Load<TextAsset>("English", Folder.Config));
+                languageDic.Add(CurrentLanguage.ChineseSimplified, ResourceManager.Load<TextAsset>("ChineseSimplified", Folder.Config));
+                languageDic.Add(CurrentLanguage.ChineseTraditional, ResourceManager.Load<TextAsset>("ChineseTraditional", Folder.Config));
+            }
+            return languageDic;
+        }
+    }
+    public static Dictionary<CurrentLanguage, TextAsset> languageDic;
+
+    public static Dictionary<CurrentLanguage, XmlDocument> XmlDocumentDictionary
+    {
+        get
+        {
+            if (xmlDocumentDictionary == null)
+            {
+                xmlDocumentDictionary = new Dictionary<CurrentLanguage, XmlDocument>();
+                XmlDocument xmlDocument = new XmlDocument();
+                xmlDocument.LoadXml(LanguageDic[CurrentLanguage.English].text);
+                xmlDocumentDictionary.Add(CurrentLanguage.English, xmlDocument);
+                xmlDocument = new XmlDocument();
+                xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
+                xmlDocumentDictionary.Add(CurrentLanguage.ChineseSimplified, xmlDocument);
+                xmlDocument = new XmlDocument();
+                xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseTraditional].text);
+                xmlDocumentDictionary.Add(CurrentLanguage.ChineseTraditional, xmlDocument);
+            }
+            return xmlDocumentDictionary;
+        }
+    }
+    public static Dictionary<CurrentLanguage, XmlDocument> xmlDocumentDictionary;
 
     public static void Initialize()
     {
@@ -38,19 +73,6 @@ public class Language
             LanguageManager.CurrentLanguage = CurrentLanguage.ChineseSimplified;
         }
 
-        LanguageDic.Add(CurrentLanguage.English, ResourceManager.Load<TextAsset>("English", Folder.Config));
-        LanguageDic.Add(CurrentLanguage.ChineseSimplified, ResourceManager.Load<TextAsset>("ChineseSimplified", Folder.Config));
-        LanguageDic.Add(CurrentLanguage.ChineseTraditional, ResourceManager.Load<TextAsset>("ChineseTraditional", Folder.Config));
-        XmlDocument xmlDocument = new XmlDocument();
-        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.English].text);
-        XmlDocumentDictionary.Add(CurrentLanguage.English, xmlDocument);
-        xmlDocument = new XmlDocument();
-        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseSimplified].text);
-        XmlDocumentDictionary.Add(CurrentLanguage.ChineseSimplified, xmlDocument);
-        xmlDocument = new XmlDocument();
-        xmlDocument.LoadXml(LanguageDic[CurrentLanguage.ChineseTraditional].text);
-        XmlDocumentDictionary.Add(CurrentLanguage.ChineseTraditional, xmlDocument);
-
         if (LanguageManager.CurrentLanguage == CurrentLanguage.Default)
         {
             if (Application.systemLanguage == SystemLanguage.ChineseSimplified)
@@ -248,10 +270,6 @@ public class Language
 
     public static string GetStr(string page, string id, CurrentLanguage language)
     {
-        if (XmlDocumentDictionary == null || XmlDocumentDictionary.Count==0)
-        {
-            Initialize();
-        }
         XmlDocument xmlDocument = XmlDocumentDictionary[language];
 
         try

ProjectSettings/GraphicsSettings.asset

@@ -43,13 +43,13 @@ GraphicsSettings:
     type: 0}
   m_TierSettings_Tier1:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier2:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_TierSettings_Tier3:
     renderingPath: 1
-    useCascadedShadowMaps: 1
+    useCascadedShadowMaps: 0
   m_DefaultRenderingPath: 1
   m_DefaultMobileRenderingPath: 1
   m_TierSettings: []