Browse Source

改善加载存档流程

liuqilin 7 years ago
parent
commit
986146d1a1

+ 25 - 0
Assets/Plugins/Alipay/IOS/AlipaySDK.framework.meta

@@ -0,0 +1,25 @@
+fileFormatVersion: 2
+guid: 786969225a8dc4e0eb4e00a91e7e1501
+folderAsset: yes
+timeCreated: 1502698138
+licenseType: Pro
+PluginImporter:
+  serializedVersion: 1
+  iconMap: {}
+  executionOrder: {}
+  isPreloaded: 0
+  isOverridable: 0
+  platformData:
+    Any:
+      enabled: 0
+      settings: {}
+    Editor:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+    iOS:
+      enabled: 1
+      settings: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Resource/Logo.unity

@@ -614,7 +614,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   AuditEdition: 1
   DebugMode: 0
-  CatchException: 1
+  CatchException: 0
   DebugModeGo: {fileID: 0}
 --- !u!4 &1833966245
 Transform:

+ 12 - 12
Assets/Resource/Prefab/PrefabUI/Canvas.prefab

@@ -908,7 +908,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!1 &1053465316034782
 GameObject:
   m_ObjectHideFlags: 1
@@ -17344,7 +17344,7 @@ GameObject:
   - component: {fileID: 222156513021321458}
   - component: {fileID: 114814403820785534}
   - component: {fileID: 225296112413584246}
-  - component: {fileID: 223834424529227654}
+  - component: {fileID: 223259751514844538}
   m_Layer: 5
   m_Name: U_LoadingPanel
   m_TagString: Untagged
@@ -62600,43 +62600,43 @@ CanvasRenderer:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1759871904516498}
---- !u!223 &223654869320677392
+--- !u!223 &223259751514844538
 Canvas:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1948781497737682}
+  m_GameObject: {fileID: 1994305511662682}
   m_Enabled: 1
   serializedVersion: 2
-  m_RenderMode: 0
+  m_RenderMode: 2
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
-  m_OverrideSorting: 0
+  m_OverrideSorting: 1
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_TargetDisplay: 0
---- !u!223 &223834424529227654
+--- !u!223 &223654869320677392
 Canvas:
   m_ObjectHideFlags: 1
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 1994305511662682}
+  m_GameObject: {fileID: 1948781497737682}
   m_Enabled: 1
   serializedVersion: 2
-  m_RenderMode: 2
+  m_RenderMode: 0
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
-  m_OverrideSorting: 1
+  m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_SortingLayerID: 0
-  m_SortingOrder: 2
+  m_SortingOrder: 0
   m_TargetDisplay: 0
 --- !u!224 &224000362090024068
 RectTransform:

+ 1 - 0
Assets/Resource/XML/lan/ChineseSimplified.xml

@@ -521,6 +521,7 @@
     <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[分享失败]]></ShareFail>
     <IdenticalID desc=""><![CDATA[相同的ID]]></IdenticalID>
+    <RecoverConfig desc=""><![CDATA[云端获取到一个等级为[&value&]的存档,是否恢复?]]></RecoverConfig>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美丽花园-1]]></Achieve1>

+ 1 - 0
Assets/Resource/XML/lan/ChineseTraditional.xml

@@ -521,6 +521,7 @@
     <ShareSuccess desc=""><![CDATA[分享成功]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[分享失敗]]></ShareFail>
     <IdenticalID desc=""><![CDATA[相同的ID]]></IdenticalID>
+    <RecoverConfig desc=""><![CDATA[雲端獲取到一個等級為[&value&]的存檔,是否恢復?]]></RecoverConfig>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[美麗花園-1]]></Achieve1>

+ 1 - 0
Assets/Resource/XML/lan/English.xml

@@ -522,6 +522,7 @@ Increase all Coin prudoction by [&coin_person&](permanently)]]></Pack12>
     <ShareSuccess desc=""><![CDATA[Share success]]></ShareSuccess>
     <ShareFail desc=""><![CDATA[Share fail]]></ShareFail>
     <IdenticalID desc=""><![CDATA[Identical ID]]></IdenticalID>
+    <RecoverConfig desc=""><![CDATA[There is another archive already(Lv[&value&]), restore it?]]></RecoverConfig>
   </Common>
   <AchieveName>
     <Achieve1 desc=""><![CDATA[Lovely Garden 1]]></Achieve1>

BIN
Assets/Resource/Xlsx/language_config.xlsx


+ 1 - 0
Assets/Script/Label/LanguageLabel.cs

@@ -517,6 +517,7 @@ public class LanguageLabel
     	public static string Common__ShareSuccess = "Common__ShareSuccess";
     	public static string Common__ShareFail = "Common__ShareFail";
     	public static string Common__IdenticalID = "Common__IdenticalID";
+    	public static string Common__RecoverConfig = "Common__RecoverConfig";
     	public static string AchieveName = "AchieveName";
     	public static string AchieveName__Achieve1 = "AchieveName__Achieve1";
     	public static string AchieveName__Achieve2 = "AchieveName__Achieve2";

+ 2 - 0
Assets/Script/Manage/AnimManager.cs

@@ -181,6 +181,8 @@ public class AnimManager : Regist
         CurveFuncDicV.Add(Curve.Linear, Linear);
         CurveFuncDicV.Add(Curve.EaseOutQuad, EaseOutQuad);
 
+        enabled = true;
+
         return false;
     }
 

+ 21 - 5
Assets/Script/Manage/AudioManager.cs

@@ -35,15 +35,20 @@ public class AudioManager : Regist
 
     #endregion
 
-    public override void InstantiatePrefabs()
+    public override bool InitAtOnce()
     {
-        ResourceManager.Get(ResourceLabel.Music, Folder.Audio, true, transform, true, ObjType.Music);
+        if (base.InitAtOnce())
+        {
+            return true;
+        }
+
+        Instance = this;
+
+        return false;
     }
 
     public override void FirstInit()
     {
-        Instance = this;
-
         #region MusicMini
 
         TweenAudio tween = MinigameAudio.CreateTweenAudio(1, 2f, true, true, Curve.EaseOutQuad);
@@ -129,8 +134,19 @@ public class AudioManager : Regist
         }
     }
 
-    public override void RegistReference()
+    public static bool Initd;
+    public static void Init()
     {
+        if (Initd)
+        {
+            return;
+        }
+        else
+        {
+            Initd = true;
+        }
+        
+        ResourceManager.Get(ResourceLabel.Music, Folder.Audio, true, Instance.transform, true, ObjType.Music);
         AudioSource[] audioSources = ResourceManager.Gets<AudioSource>(ResourceLabel.Music);
 
         ClipAudioSource = audioSources[2];

+ 37 - 13
Assets/Script/Manage/ConfigManager.cs

@@ -12,6 +12,7 @@ using System.Linq;
 using System.Security.Cryptography;
 using Sfs2X.Entities;
 using Sfs2X.Entities.Data;
+using UnityEngine.UI;
 using Random = UnityEngine.Random;
 
 public class ConfigManager : Regist
@@ -60,7 +61,7 @@ public class ConfigManager : Regist
         {
             if (string.IsNullOrEmpty(configPath))
             {
-                configPath = $"{Application.persistentDataPath}/{ResourceLabel.PlayerConfigXml}";
+                configPath = string.Format("{0}/{1}", Application.persistentDataPath, ResourceLabel.PlayerConfigXml);
             }
 
             return configPath;
@@ -73,6 +74,16 @@ public class ConfigManager : Regist
     private static string UnvalidConfigMD5 = "";
     private static void LoadConfigDocument()
     {
+        //if (!PlayerPrefManager.GetBool(PlayerPrefManager.INTERACT_CONFIG, false))
+        //{
+        //    Debug.LogWarning("Download Archive : did not interact");
+
+        //    PlayerDocumentDamageFlag = true;
+        //    SerialNumberRequestFlag = false;
+
+        //    return;
+        //}
+
         int defaultVersion;
         int nativeVersion;
 
@@ -161,7 +172,7 @@ public class ConfigManager : Regist
                     {
                         configDocument = UpdateConfigDocument(nativeVersion, nativeDoc, DefaultConfigDocument);
 
-                        HttpManager.UploadConfig();
+                        //HttpManager.UploadConfig();
                     }
                 }
                 else if (nativeVersion > defaultVersion)
@@ -264,25 +275,24 @@ public class ConfigManager : Regist
         //Debug.Log(jsonData.ToJson());
         if (jsonData.Inst_Object.Keys.Contains("l"))
         {
-            configDocument = new XmlDocument();
+            XmlDocument recoverdDocument = new XmlDocument();
 
-            configDocument.LoadXml(jsonData["l"].ToString());
+            recoverdDocument.LoadXml(jsonData["l"].ToString());
 
-            int nativeVersion = int.Parse(configDocument.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
-            int defaultVersion = int.Parse(DefaultConfigDocument.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
+            int RecoverdVersion = int.Parse(recoverdDocument.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
+            int DefaultVersion = int.Parse(DefaultConfigDocument.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
 
-            if (nativeVersion < defaultVersion)
+            PlayerDocumentDamageFlag = false;
+            if (RecoverdVersion <= DefaultVersion)
             {
-                UpdateConfigDocument(nativeVersion, configDocument, DefaultConfigDocument);
-
-                HttpManager.UploadConfig();
+                UpdateConfigDocument(RecoverdVersion, recoverdDocument, DefaultConfigDocument);
+                configDocument = recoverdDocument;
+                PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, true);
             }
-            else if (nativeVersion > defaultVersion)
+            else if (RecoverdVersion > DefaultVersion)
             {
                 configDocument = DefaultConfigDocument;
             }
-
-            PlayerDocumentDamageFlag = false;
         }
         else
         {
@@ -1182,6 +1192,20 @@ public class ConfigManager : Regist
     }
 
 
+    public static int GetGardenLevel(XmlDocument xmlDocument)
+    {
+        XmlNodeList nodeList = xmlDocument.SelectNodes(PlayerConfigLabel.RootNode + "/" + PlayerConfigLabel.SkillList + "/" + PlayerConfigLabel.Skill);
+        for (int i = 0; i < nodeList.Count; i++)
+        {
+            if (nodeList[i].Attributes[0].Value == "Ability1")
+            {
+                return int.Parse(nodeList[i].Attributes[3].Value);
+            }
+        }
+        return -1;
+    }
+
+
     public static XmlDocument GetXmlDocument(string ConfigName)
     {
         TextAsset textAsset = ResourceManager.Load<TextAsset>(ConfigName, Folder.Config);

+ 1 - 1
Assets/Script/Manage/GardenManager.cs

@@ -559,7 +559,7 @@ public class GardenManager : Regist
                         {
                             flowerInfo.Add();
                             UpdatePlantCardStatus(flowerInfo);
-                            HttpManager.UploadConfig();
+                            //HttpManager.UploadConfig();
 
                             PlayFlowerCardMaterialTween();
 

+ 79 - 0
Assets/Script/Manage/HttpManager.cs

@@ -1001,6 +1001,85 @@ public class HttpManager : Regist
     }
 
 
+    public static void GetSelfConfig()
+    {
+        Debug.LogWarning("GetBySerialNumber");
+        GetTargetConfig
+        (
+            SerialNumber,
+            jData0 =>
+            {
+                XmlDocument config = ReadConfig(jData0);
+                if (config == null)
+                {
+                    Debug.LogWarning("GetByID");
+                    GetConfigByID
+                    (
+                        ID,
+                        jData1 =>
+                        {
+                            config = ReadConfig(jData1);
+                            if (config == null)
+                            {
+                                Debug.LogWarning("Did not get");
+                                UploadConfig();
+                            }
+                            else
+                            {
+                                RecoverConfig(jData1, config);
+                            }
+                        }
+                    );
+                }
+                else
+                {
+                    RecoverConfig(jData0, config);
+                }
+            }
+        );
+    }
+
+    private static XmlDocument ReadConfig(JsonData jsonData)
+    {
+        if (jsonData.Inst_Object.Keys.Contains("l"))
+        {
+            XmlDocument recoverdDocument = new XmlDocument();
+
+            recoverdDocument.LoadXml(jsonData["l"].ToString());
+
+            int RecoverdVersion = int.Parse(recoverdDocument.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
+            int DefaultVersion = int.Parse(ConfigManager.DefaultConfigDocument.SelectSingleNode(PlayerConfigLabel.RootNode).SelectSingleNode(PlayerConfigLabel.Version).Attributes[0].Value);
+
+            if (RecoverdVersion <= DefaultVersion)
+            {
+                ConfigManager.UpdateConfigDocument(RecoverdVersion, recoverdDocument, ConfigManager.DefaultConfigDocument);
+                return recoverdDocument;
+            }
+        }
+        return null;
+    }
+
+    private static void RecoverConfig(JsonData jsonData, XmlDocument document)
+    {
+        string hint = Language.GetStr(LanguageLabel.Common__RecoverConfig);
+        hint = hint.Replace(TransferLabel.Value, ConfigManager.GetGardenLevel(document).ToString());
+
+        Bubble.Show
+        (
+            hint, null, null, null,
+            () =>
+            {
+                DelayCall.Call(2, () => Manager.SwitchConfigCallback(jsonData));
+                PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, true);
+            },
+            () =>
+            {
+                PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, true);
+            }
+        );
+    }
+
+
     public static void GetTargetConfig(string id, URLRequest.URLRequestJsonCallBackDelegate callback)
     {
         URLRequestData urlData = new URLRequestData();

+ 12 - 4
Assets/Script/Manage/Initializer.cs

@@ -236,18 +236,18 @@ public class Initializer : MonoBehaviour
     {
         if (Instance.CatchException)
         {
-            DebugManager.TryCatch(Init, EnableDebugLab);
+            DebugManager.TryCatch(InitGame, EnableDebugLab);
         }
         else
         {
-            Init();
+            InitGame();
         }
     }
 
-    public static void Init()
+    public static void InstantiatePrefabs()
     {
         DebugText = GameObject.Find(CanvasLabel.U_DebugLab).GetComponent<Text>();
-        
+
         DebugText.text = "Error code : 1";
 
         TutorialManager.NewplayerTutorial = ConfigManager.GetBoolFormConfig(PlayerConfigLabel.NewplayerTutorial);
@@ -297,6 +297,11 @@ public class Initializer : MonoBehaviour
         }
 
         DebugText.text = "Error code : 2";
+    }
+
+    public static void InitGame()
+    {
+        InstantiatePrefabs();
 
         for (int i = 0; i < RegistList.Count; i++)
         {
@@ -388,6 +393,9 @@ public class Initializer : MonoBehaviour
             yield return null;
         }
 
+        UIManager.Init(Instance.DebugMode);
+        AudioManager.Init();
+
         InitEntrance();
     }
 

+ 16 - 3
Assets/Script/Manage/Manager.cs

@@ -614,7 +614,14 @@ public class Manager : Regist
         {
             UploadConfigTimer = 0;
 
-            HttpManager.UploadConfig();
+            if (!PlayerPrefManager.GetBool(PlayerPrefManager.INTERACT_CONFIG, false))
+            {
+                HttpManager.GetSelfConfig();
+            }
+            else
+            {
+                HttpManager.UploadConfig();
+            }
         }
     }
 
@@ -1156,7 +1163,14 @@ public class Manager : Regist
         
         GardenLevel = GardenLevel;
 
-        HttpManager.UploadConfig();
+        if (!PlayerPrefManager.GetBool(PlayerPrefManager.INTERACT_CONFIG, false))
+        {
+            HttpManager.GetSelfConfig();
+        }
+        else
+        {
+            HttpManager.UploadConfig();
+        }
     }
 
     public static void ReactiveLoginCallback(JsonData jsonData)
@@ -1200,7 +1214,6 @@ public class Manager : Regist
             HttpManager.ID = ConfigManager.GetStringFormConfig(PlayerConfigLabel.ID);
             HttpManager.SerialNumber = ConfigManager.GetStringFormConfig(PlayerConfigLabel.SerialNumber);
 
-
             Bubble.Show(null, Language.GetStr(LanguageLabel.UI__La_Lab0), null, null, () => { Application.Quit(); }, null, false);
 
 

+ 39 - 0
Assets/Script/Manage/PlayerPrefManager.cs

@@ -0,0 +1,39 @@
+using System.Collections;
+using System.Collections.Generic;
+
+using UnityEngine;
+
+public class PlayerPrefManager
+{
+    public const string INTERACT_CONFIG = "Interact_Config";
+
+    public static bool GetBool(string label, bool defaultValue)
+    {
+        int i = PlayerPrefs.GetInt(label, -1);
+        if (i == -1)
+        {
+            return defaultValue;
+        }
+        if (i == 0)
+        {
+            return false;
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    public static void SaveBool(string label, bool value)
+    {
+        if (value)
+        {
+            PlayerPrefs.SetInt(label, 1);
+        }
+        else
+        {
+            PlayerPrefs.SetInt(label, 0);
+        }
+        PlayerPrefs.Save();
+    }
+}

+ 12 - 0
Assets/Script/Manage/PlayerPrefManager.cs.meta

@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: eecd64f79a0554d499a08af343bb0713
+timeCreated: 1516076198
+licenseType: Pro
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 6 - 14
Assets/Script/Manage/UIManager.cs

@@ -59,6 +59,12 @@ public class UIManager : Regist
         ResourceManager.SetActive(CanvasLabel.U_LoadingPanel, true);
         Initializer.SetWarningTitleAndText();
 
+        #region 
+
+        ResourceManager.Get(CanvasLabel.K_Bubble).AddScript<Bubble>();
+
+        #endregion
+
         Initd = true;
     }
 
@@ -75,11 +81,6 @@ public class UIManager : Regist
         return false;
     }
 
-    public override void InstantiatePrefabs()
-    {
-        Init(Initializer.Instance.DebugMode);
-    }
-
 
     public override void FirstInit()
     {
@@ -1885,15 +1886,6 @@ public class UIManager : Regist
 
         #endregion
 
-        #region K
-
-        ResourceManager.Get(CanvasLabel.K_Bubble).AddScript<Bubble>();
-
-        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.K_CancelLab), new MulLanStr(LanguageLabel.Common__Cancel));
-        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.K_ConfirmLab), new MulLanStr(LanguageLabel.Common__Confirm));
-
-        #endregion
-
         #region L
 
         LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.L_MusicOnLab), new MulLanStr(LanguageLabel.UI__L_On));

+ 1 - 1
Assets/Script/Object/Player.cs

@@ -534,7 +534,7 @@ public class CloseItem
         Unlock();
         AudioManager.PlayClip(AudioLabel.GetCurrent);
         PlayerManager.BoughtCloseIDs.UniqueAdd(ID);
-        HttpManager.UploadConfig();
+        //HttpManager.UploadConfig();
     }
 
     public void NavigateToChargeFromDressroom()

+ 4 - 4
Assets/Script/Object/Skill/Pack.cs

@@ -371,10 +371,10 @@ public class Pack : SkillRoot
 
         AudioManager.PlayClip(AudioLabel.UseSkill);
 
-        if (BuyCur == Current.Cash)
-        {
-            HttpManager.UploadConfig();
-        }
+        //if (BuyCur == Current.Cash)
+        //{
+        //    HttpManager.UploadConfig();
+        //}
 
         GetBuff();
 

+ 12 - 11
Assets/Script/Tool/Auxiliary.cs

@@ -142,17 +142,18 @@ public class Auxiliary : Regist
         //}
 
 
-        //if (Input.GetKeyDown(KeyCode.Space))
-        //{
-        //    Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
-        //    RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
-        //    Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
-        //    Debug.Log(screenPosition);
-        //    Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
-        //    DebugManager.ResetGardenLevel(22);
-        //    DebugManager.ResetVisitTutorial();
-        //    HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
-        //}
+        if (Input.GetKeyDown(KeyCode.Space))
+        {
+            PlayerPrefManager.SaveBool(PlayerPrefManager.INTERACT_CONFIG, false);
+            //Debug.Log(ResourceManager.Get<Canvas>(CanvasLabel.Canvas).scaleFactor);
+            //RectTransform rectTransform = ResourceManager.Get<RectTransform>(CanvasLabel.P_ScreenShotRect);
+            //Vector2 screenPosition = RectTransformUtility.WorldToScreenPoint(null, rectTransform.position);
+            //Debug.Log(screenPosition);
+            //Debug.Log(ConfigManager.ConfigRootNode.OuterXml);
+            //DebugManager.ResetGardenLevel(22);
+            //DebugManager.ResetVisitTutorial();
+            //HttpManager.GetThanksGiftInfo(RechargeGiftManager.Init, () => Bubble.Show(null, Language.GetStr(LanguageLabel.UI__GetThanksGiftInfoFailed)));
+        }
 
         //if (Input.GetKeyDown(KeyCode.A))
         //{

+ 5 - 0
Assets/Script/Tool/UI/Bubble.cs

@@ -44,6 +44,11 @@ public class Bubble : Regist
         return false;
     }
 
+    public override void FirstInit()
+    {
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.K_CancelLab), new MulLanStr(LanguageLabel.Common__Cancel));
+        LanguageManager.Add(ResourceManager.Get<Text>(CanvasLabel.K_ConfirmLab), new MulLanStr(LanguageLabel.Common__Confirm));
+    }
 
     public static void Show(string tit = null, string lab = null, string notifyLab = null, Sprite sprite = null, UnityAction confirmAction = null, UnityAction cancelAction = null, bool enableCancle = true)
     {

+ 3 - 3
ProjectSettings/GraphicsSettings.asset

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