Browse Source

dispose顺序

guodong 1 year ago
parent
commit
fdc5ce5a50
30 changed files with 390 additions and 73 deletions
  1. 17 3
      GameClient/Assets/Game/HotUpdate/Assets/PreloadManager.cs
  2. 0 1
      GameClient/Assets/Game/HotUpdate/Controller/GameController.cs
  3. 4 4
      GameClient/Assets/Game/HotUpdate/DressUp/DressUpLayerOperation.cs
  4. 1 2
      GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs
  5. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs
  6. 2 1
      GameClient/Assets/Game/HotUpdate/Views/BaseWindow.cs
  7. 1 1
      GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs
  8. 1 1
      GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs
  9. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs
  10. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs
  11. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs
  12. 1 1
      GameClient/Assets/Game/HotUpdate/Views/DressUp/DressFilterView.cs
  13. 1 1
      GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs
  14. 1 1
      GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs
  15. 1 1
      GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs
  16. 1 2
      GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs
  17. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs
  18. 1 1
      GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs
  19. 1 22
      GameClient/Assets/Game/Launcher/GameLauncher.cs
  20. 32 0
      GameClient/Assets/Game/Launcher/VersionCheker.cs
  21. 11 0
      GameClient/Assets/Game/Launcher/VersionCheker.cs.meta
  22. 2 2
      GameClient/Assets/Game/Launcher/Views/LauncherView.cs
  23. 9 9
      GameClient/Assets/Resources/BuildinFileManifest.asset
  24. 1 1
      GameClient/Assets/Resources/Scenes.meta
  25. 274 0
      GameClient/Assets/Resources/Scenes/GameLauncher.unity
  26. 0 0
      GameClient/Assets/Resources/Scenes/GameLauncher.unity.meta
  27. 2 3
      GameClient/Assets/Resources/Scenes/VersionChecker.unity
  28. 7 0
      GameClient/Assets/Resources/Scenes/VersionChecker.unity.meta
  29. 4 1
      GameClient/ProjectSettings/EditorBuildSettings.asset
  30. 10 10
      GameClient/UserSettings/EditorUserSettings.asset

+ 17 - 3
GameClient/Assets/Game/HotUpdate/Assets/PreloadManager.cs

@@ -1,11 +1,25 @@
-using System.Collections.Generic;
+using GFGGame.Launcher;
+using System.Collections.Generic;
 
 namespace GFGGame
 {
-    public class PreloadManager : SingletonBase<PreloadManager>
+    public class PreloadManager : SingletonMonoBase<PreloadManager>
     {
         private Queue<string> waitQueue = new Queue<string>();
 
-        
+        public void Init()
+        {
+
+        }
+
+        public void Add(string location)
+        {
+            waitQueue.Enqueue(location);
+        }
+
+        private void Update()
+        {
+            
+        }
     }
 }

+ 0 - 1
GameClient/Assets/Game/HotUpdate/Controller/GameController.cs

@@ -164,7 +164,6 @@ namespace GFGGame
             LoadingView.Instance.SetProgress(100, () =>
             {
                 ViewManager.Hide<LoadingView>();
-                // LoadingView.Instance.Close();
 
                 GameGlobal.isEnterGame = true;
                 if (MainStoryDataManager.CheckOpenMainUI() || GameGlobal.skipGuide)

+ 4 - 4
GameClient/Assets/Game/HotUpdate/DressUp/DressUpLayerOperation.cs

@@ -41,7 +41,7 @@ namespace GFGGame
 
         public void InitLayer(ItemCfg itemCfg, int layerId)
         {
-            Debug.Log($"InitLayer {itemCfg.id}");
+            //Debug.Log($"InitLayer {itemCfg.id}");
             this.itemCfg = itemCfg;
             this.layerId = layerId;
             actionType = EAction.Layer;
@@ -49,7 +49,7 @@ namespace GFGGame
 
         public void InitBody()
         {
-            Debug.Log("InitBody");
+            //Debug.Log("InitBody");
             actionType = EAction.Body;
         }
 
@@ -177,7 +177,7 @@ namespace GFGGame
                 //需加载
                 locations.Add(this.resPath);
             }
-            if(!string.IsNullOrEmpty(effectResPath) && YooAssets.IsNeedDownloadFromRemote(resPath))
+            if(!string.IsNullOrEmpty(effectResPath) && YooAssets.IsNeedDownloadFromRemote(effectResPath))
             {
                 //需加载
                 locations.Add(effectResPath);
@@ -238,7 +238,7 @@ namespace GFGGame
 
         private void UpdateLayer()
         {
-            Debug.Log($"UpdateLayer add {itemCfg.id}");
+            //Debug.Log($"UpdateLayer add {itemCfg.id}");
             //清理旧的
             var spritObjName = string.Format(DressUpUtil.FORMAT_SPRITE_NAME, itemCfg.subType, layerId);
             DressUpUtil.TryRemoveSprite(parentObj, spritObjName);

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Views/Bag/BagExchangeView.cs

@@ -19,13 +19,12 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
-
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Bag/BagView.cs

@@ -16,7 +16,6 @@ namespace GFGGame
         // private List<ItemView> _listItemViews = new List<ItemView>();
         public override void Dispose()
         {
-            base.Dispose();
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -33,6 +32,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 2 - 1
GameClient/Assets/Game/HotUpdate/Views/BaseWindow.cs

@@ -83,13 +83,14 @@ namespace GFGGame
         public override void Dispose()
         {
             // if (packageName == ResPathUtil.GetUIPackagePath("CommonGame") || packageName == ResPathUtil.GetUIPackagePath("Common") || packageName == ResPathUtil.GetUIPackagePath("Main")) return;//这几个包不释放
-            base.Dispose();
+            
             if (_window != null)
             {
                 _window.RemoveFromParent();
                 _window.Dispose();
                 _window = null;
             }
+            base.Dispose();
         }
 
         /// <summary>

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/ClothingFoster/ClothingView.cs

@@ -30,7 +30,6 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-            base.Dispose();
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -45,6 +44,7 @@ namespace GFGGame
             _effectUI1 = null;
             _propertyList.Clear();
             _addPropertyList.Clear();
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/CommonGame/GoodsItemTipsView.cs

@@ -13,7 +13,6 @@ namespace GFGGame
         private ItemCfg itemCfg;
         public override void Dispose()
         {
-            base.Dispose();
             // itemView.Dispose();
             if (approachView != null)
             {
@@ -25,6 +24,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
         protected override void OnInit()
         {

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySignView.cs

@@ -26,7 +26,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             EffectUIPool.Recycle(_effectUI0);
             _effectUI0 = null;
             EffectUIPool.Recycle(_effectUI1);
@@ -44,6 +43,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailySupplyView.cs

@@ -25,7 +25,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             // if (_valueBarController != null)
             // {
             //     _valueBarController.Dispose();
@@ -45,6 +44,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DailyWelfare/DailyWelfareView.cs

@@ -20,7 +20,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -31,6 +30,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/DressUp/DressFilterView.cs

@@ -23,12 +23,12 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/EnduringGiftBox/SpecialOfferGiftBoxView.cs

@@ -40,13 +40,13 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
 
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnShown()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/Field/FieldView.cs

@@ -18,7 +18,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             if (_valueBarController != null)
             {
                 _valueBarController.Dispose();
@@ -30,6 +29,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/FieldGuide/SuitPartsDetailView.cs

@@ -12,13 +12,13 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             _items = null;
             if (_ui != null)
             {
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 2
GameClient/Assets/Game/HotUpdate/Views/Loading/LoadingView.cs

@@ -30,7 +30,6 @@ namespace GFGGame
         }
         public override void Dispose()
         {
-            base.Dispose();
 
             m_Instance = null;
             EffectUIPool.Recycle(_effectUI1);
@@ -40,7 +39,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
-
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryCardChoose.cs

@@ -25,7 +25,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
              EffectUIPool.Recycle(_effectUI1);
             _effectUI1 = null;
             EffectUIPool.Recycle(_effectUI2);
@@ -50,6 +49,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void OnInit()

+ 1 - 1
GameClient/Assets/Game/HotUpdate/Views/MainStory/StoryDialogView.cs

@@ -45,7 +45,6 @@ namespace GFGGame
 
         public override void Dispose()
         {
-            base.Dispose();
             if (_sceneObject != null)
             {
                 PrefabManager.Instance.Restore(_sceneObject);
@@ -67,6 +66,7 @@ namespace GFGGame
                 _ui.Dispose();
                 _ui = null;
             }
+            base.Dispose();
         }
 
         protected override void Init()

+ 1 - 22
GameClient/Assets/Game/Launcher/GameLauncher.cs

@@ -1,9 +1,6 @@
 using UnityEngine;
 using GFGGame;
-using GFGGame.Launcher;
 using FairyGUI;
-using System;
-using System.Collections.Generic;
 using YooAsset;
 using UnityEngine.SceneManagement;
 
@@ -19,14 +16,7 @@ public class GameLauncher : MonoBehaviour
     {
         Instance = this;
         DontDestroyOnLoad(gameObject);
-        var roots = this.gameObject.scene.GetRootGameObjects();
-        foreach(var t in roots)
-        {
-            if(t.name == "FairyGUI" || t.name == "Stage Camera")
-            {
-                DontDestroyOnLoad(t);
-            }
-        }
+        SceneManager.LoadScene("VersionChecker");
     }
 
     // Start is called before the first frame update
@@ -34,17 +24,6 @@ public class GameLauncher : MonoBehaviour
     {
         Screen.sleepTimeout = SleepTimeout.NeverSleep;
         Application.runInBackground = true;
-        LauncherConfig.InitScriptCompilation();
-        FGUILauncher.Init();
-
-        HealthAdviceView.Open();
-        int time = LauncherConfig.netType == LauncherConfig.EnumNetType.TISHEN ? 10 : 1;
-        Timers.inst.Add(time, 1, (object param) =>
-        {
-            HealthAdviceView.Close();
-            LauncherView.Instance.Open();
-            LauncherController.InitLauncherCfg();
-        });
     }
 
 }

+ 32 - 0
GameClient/Assets/Game/Launcher/VersionCheker.cs

@@ -0,0 +1,32 @@
+using FairyGUI;
+using UnityEngine;
+
+namespace GFGGame
+{
+    public class VersionCheker : MonoBehaviour
+    {
+        private void Awake()
+        {
+            var roots = this.gameObject.scene.GetRootGameObjects();
+            foreach (var t in roots)
+            {
+                if (t.name == "FairyGUI" || t.name == "Stage Camera")
+                {
+                    DontDestroyOnLoad(t);
+                }
+            }
+
+            LauncherConfig.InitScriptCompilation();
+            FGUILauncher.Init();
+
+            HealthAdviceView.Open();
+            int time = LauncherConfig.netType == LauncherConfig.EnumNetType.TISHEN ? 10 : 1;
+            Timers.inst.Add(time, 1, (object param) =>
+            {
+                HealthAdviceView.Close();
+                LauncherView.Instance.Open();
+                LauncherController.InitLauncherCfg();
+            });
+        }
+    }
+}

+ 11 - 0
GameClient/Assets/Game/Launcher/VersionCheker.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: eed86c043c9652a47b68ed09cd31efc9
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
GameClient/Assets/Game/Launcher/Views/LauncherView.cs

@@ -59,7 +59,7 @@ namespace GFGGame
                 _wrapper1.Dispose();
                 _wrapper1 = null;
             }
-            UIPackage.RemovePackage("UI/" + _packageName);
+            UIPackage.RemovePackage("UI/" + _packageName + "/" + _packageName);
             _ui.Dispose(true);
             _ui = null;
             // if (_gameObject != null)
@@ -193,7 +193,7 @@ namespace GFGGame
         /// 关闭界面
         /// </summary>
         /// <param name="toDestroy"></param>
-        public void Close(bool toDestroy = false)
+        public void Close(bool toDestroy = true)
         {
             if (!isOpen)
             {

+ 9 - 9
GameClient/Assets/Resources/BuildinFileManifest.asset

@@ -24,13 +24,13 @@ MonoBehaviour:
   - 0af6c381e44d02a04bd555d00d9486ed.bundle
   - 0b029509b7ebb6618311ec4efa425b40.bundle
   - 0b439b9b7105946a8272fc40aa434e95.bundle
-  - 0fa0461e5a54e00e9ac633194671e902.bundle
   - 0ff43397fd334ae99d8a7d3cf3dfb4a9.bundle
   - 10c848a16b9e0e045fdc0d4a21ab400f.bundle
   - 116cc3604898b17747b846f150e9ab50.bundle
   - 12a842a68504e30342a864d439b4aa53.bundle
   - 12d15c825109752c59a3cdcfc7fe71e7.bundle
   - 13c062da354bc5b2e3eb13fc68197fec.bundle
+  - 1460b04131ac802a315aacc69cd522ed.rawfile
   - 14ab28d46fb5c587b56859b3e71bcb0f.bundle
   - 14e1f62a5cce6cc6fabf0b6674f8c3be.bundle
   - 158f05f624957192a7d8bdc742088108.bundle
@@ -66,6 +66,7 @@ MonoBehaviour:
   - 32ff0d940efa72d7f1a5cb9fd340794c.bundle
   - 3473b8502aac2cec2b8d64d689d00af4.bundle
   - 387d323a034c182b05d85b854a588312.bundle
+  - 389467199645f812903296d771443a1d.bundle
   - 39959f04b4134c3e051b6d4a67675a5a.bundle
   - 3cf3e183eba24619774f34dddfe05c98.bundle
   - 3d7c6f9938c954709399223549b76b3b.bundle
@@ -74,11 +75,10 @@ MonoBehaviour:
   - 4595391f4b01c2187bb20cb5832fa553.bundle
   - 466f575b3f4ae9c1363f606ebec703eb.bundle
   - 46e58baef09dec5eaf20349cb5141cdd.bundle
-  - 4782ec48a4da95e11db822559656e8c7.bundle
-  - 48a9b9ddb0824a60e2e17d856081fb17.bundle
   - 49deb832b7b674b4913e19eb6e44e03d.bundle
   - 4d324f05ed15f466ecdddd5ec4d6a023.bundle
   - 4e46fae1e2190a3bbc2149fa0954b13c.bundle
+  - 4f4bf06c7957fbf1aa5a765b8e340518.bundle
   - 50f35cb2a5700daad9bd27a9990e8d68.bundle
   - 5257f458f99c3159bab33d3c03d0561e.bundle
   - 556404fb01ca38651647aa7203ac76c9.bundle
@@ -92,6 +92,7 @@ MonoBehaviour:
   - 63e6afa476fb0dc90b32a7e36baa2846.bundle
   - 66d391bf91eb3af14bb338943b5b764d.bundle
   - 68728bf9f1c6d881e9a0c823682c8d88.bundle
+  - 6c1bdabc9a019330d652fabea6d5aa66.bundle
   - 6e64e29925851284e20dbed4932a6ab1.bundle
   - 6f21900325a86d8dcc902a6f7c444355.bundle
   - 70c119f57c1b2bea00aadda63ea96818.bundle
@@ -115,15 +116,15 @@ MonoBehaviour:
   - 8d2bdcfd84b981063b0438d6e373f74a.bundle
   - 8da660c52c3223ca79a46549c5e4d9d2.bundle
   - 8e4fd217307a54fed8018556317384c4.bundle
+  - 8ec7d4a076f3602ce3ab584868b1484e.bundle
   - 8ed1ea306119f690e147f0adcd53f81c.bundle
   - 8ffdedc7d1d7c6d14d3d34af723bef3c.bundle
+  - 90f65649df6d2742dfd89ba344059503.bundle
   - 91065e88658cf678338ae089caa347d0.bundle
   - 9196b7570c8a062583a7101e3476a8ec.bundle
   - 970a9b4507f476f11c7a01f310696f80.bundle
   - 99f428398ecb1efb0693b1f7ed32b29c.bundle
   - 9bb149d5a5a97424e6e222d91b4ed190.bundle
-  - 9ee9d22f1c62aee2657f923d1333e428.bundle
-  - 9f1024e68a7858034246b7f0b2e8d18a.rawfile
   - a0b907eed96efd281962e950c73d4ab9.bundle
   - a234436a0a729ba07f013c1488b73594.bundle
   - a3a82494dfd8e72dc85caac01333edf5.bundle
@@ -131,7 +132,6 @@ MonoBehaviour:
   - a42625bebcc94e2fab575754677bad92.bundle
   - a54cf29df933b426f44cbf7195ef6673.bundle
   - a5dded3ed1cb30e91b3036423dd9e71c.bundle
-  - a803daf646fe480bf9734f188038fb9f.bundle
   - a9dcc72882c30ef48e12d186db1f6802.bundle
   - ac00e9d1615c80397acbb09309d57792.bundle
   - ac088892f07ade5324ab2aaa19d40193.bundle
@@ -153,19 +153,19 @@ MonoBehaviour:
   - bf6376721c30345a5225357a2319b4de.bundle
   - bfc049ee1190ac8013b946d49058043d.bundle
   - bfc47e3e8f5804add0e49a62b0ecb4df.bundle
+  - c246220803a50f63dc9fd924e8b1368d.bundle
   - c394983b4fba0e1912fde1cc1be9750e.bundle
   - c5b2e35ebc920f3d4d0dea168441c669.bundle
-  - c5bed66a1d3ceef63594f54d29b93740.bundle
   - c7e27f3c5ae5036c264cc18a47c8efc9.bundle
   - c7ea5b7bb096117479634419cf57959d.bundle
   - c9da6e9b84c95c60010e55c6bffe176c.bundle
   - cae6429eb80d622a13fc794f1baed6c1.bundle
   - cb4c5f3a6776445acdcb99c401c02729.bundle
-  - cd7d7d5380c32379012c8fec81b4b022.bundle
   - ce3a75c762793d679a7d663c7a919f3c.bundle
   - cfdb7b3fce65fd6b2bc56a79ee6e46fb.bundle
   - d5b34df1bc271487c813726e7f5199e9.bundle
   - d8c3503e7efd6fcd428e4dff7578a3f8.bundle
+  - d911c4d817a678f0c55fd8f2ebf3069f.bundle
   - d94a287ac27da3fe1d66811d09d1e5d6.bundle
   - dacabb00c1f1fb5e76389c78597809b2.bundle
   - db4b020cac5671c6f6c213456ab39834.bundle
@@ -186,7 +186,6 @@ MonoBehaviour:
   - ed474264fe61ab64ebcafa9e5bb859ce.bundle
   - eda2640532ada969d8e1e8ccee1db6d0.bundle
   - eed2bdffa7939f68d634a403452effd5.bundle
-  - ef6fba5a39b43911c4f8cf5054be4b38.bundle
   - efa2e2c2d42c0988327e6af2c247fdd6.bundle
   - f1253f303355dc02374b11af4e4c9eda.bundle
   - f1d94c78c4de70e6c8020960f6a981ce.bundle
@@ -202,5 +201,6 @@ MonoBehaviour:
   - f896169e9a1bde9f56c69dd879b84f31.bundle
   - f8abfd943bac5b41b96a35e39ca24822.bundle
   - f98433b6970f87cd5d3ea1a0062c25be.bundle
+  - fce1299d4d76d24fa50d7bd51320f7ea.bundle
   - ffbed72e2023bc16a40f41236144c66d.bundle
   - ffd8a5ee9a882bb58e92b65a6fb93e1d.bundle

+ 1 - 1
GameClient/Assets/Scenes.meta → GameClient/Assets/Resources/Scenes.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f7ce641a78b69af4a8e19075c4264d98
+guid: 0853402190c422842b3009e6f385919f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 274 - 0
GameClient/Assets/Resources/Scenes/GameLauncher.unity

@@ -0,0 +1,274 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_OcclusionBakeSettings:
+    smallestOccluder: 5
+    smallestHole: 0.25
+    backfaceThreshold: 100
+  m_SceneGUID: 00000000000000000000000000000000
+  m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 9
+  m_Fog: 0
+  m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  m_FogMode: 3
+  m_FogDensity: 0.01
+  m_LinearFogStart: 0
+  m_LinearFogEnd: 300
+  m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+  m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+  m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+  m_AmbientIntensity: 1
+  m_AmbientMode: 3
+  m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+  m_SkyboxMaterial: {fileID: 0}
+  m_HaloStrength: 0.5
+  m_FlareStrength: 1
+  m_FlareFadeSpeed: 3
+  m_HaloTexture: {fileID: 0}
+  m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+  m_DefaultReflectionMode: 0
+  m_DefaultReflectionResolution: 128
+  m_ReflectionBounces: 1
+  m_ReflectionIntensity: 1
+  m_CustomReflection: {fileID: 0}
+  m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
+  m_UseRadianceAmbientProbe: 0
+--- !u!157 &3
+LightmapSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 12
+  m_GIWorkflowMode: 1
+  m_GISettings:
+    serializedVersion: 2
+    m_BounceScale: 1
+    m_IndirectOutputScale: 1
+    m_AlbedoBoost: 1
+    m_EnvironmentLightingMode: 0
+    m_EnableBakedLightmaps: 0
+    m_EnableRealtimeLightmaps: 0
+  m_LightmapEditorSettings:
+    serializedVersion: 12
+    m_Resolution: 2
+    m_BakeResolution: 40
+    m_AtlasSize: 1024
+    m_AO: 0
+    m_AOMaxDistance: 1
+    m_CompAOExponent: 1
+    m_CompAOExponentDirect: 0
+    m_ExtractAmbientOcclusion: 0
+    m_Padding: 2
+    m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
+    m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
+    m_ReflectionCompression: 2
+    m_MixedBakeMode: 2
+    m_BakeBackend: 0
+    m_PVRSampling: 1
+    m_PVRDirectSampleCount: 32
+    m_PVRSampleCount: 500
+    m_PVRBounces: 2
+    m_PVREnvironmentSampleCount: 500
+    m_PVREnvironmentReferencePointCount: 2048
+    m_PVRFilteringMode: 2
+    m_PVRDenoiserTypeDirect: 0
+    m_PVRDenoiserTypeIndirect: 0
+    m_PVRDenoiserTypeAO: 0
+    m_PVRFilterTypeDirect: 0
+    m_PVRFilterTypeIndirect: 0
+    m_PVRFilterTypeAO: 0
+    m_PVREnvironmentMIS: 0
+    m_PVRCulling: 1
+    m_PVRFilteringGaussRadiusDirect: 1
+    m_PVRFilteringGaussRadiusIndirect: 5
+    m_PVRFilteringGaussRadiusAO: 2
+    m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+    m_PVRFilteringAtrousPositionSigmaIndirect: 2
+    m_PVRFilteringAtrousPositionSigmaAO: 1
+    m_ExportTrainingData: 0
+    m_TrainingDataDestination: TrainingData
+    m_LightProbeSampleCountMultiplier: 4
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 0}
+--- !u!196 &4
+NavMeshSettings:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_BuildSettings:
+    serializedVersion: 2
+    agentTypeID: 0
+    agentRadius: 0.5
+    agentHeight: 2
+    agentSlope: 45
+    agentClimb: 0.4
+    ledgeDropHeight: 0
+    maxJumpAcrossDistance: 0
+    minRegionArea: 2
+    manualCellSize: 0
+    cellSize: 0.16666667
+    manualTileSize: 0
+    tileSize: 256
+    accuratePlacement: 0
+    maxJobWorkers: 0
+    preserveTilesOutsideBounds: 0
+    debug:
+      m_Flags: 0
+  m_NavMeshData: {fileID: 0}
+--- !u!1 &519420028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 519420032}
+  - component: {fileID: 519420031}
+  - component: {fileID: 519420029}
+  - component: {fileID: 519420030}
+  - component: {fileID: 519420033}
+  m_Layer: 0
+  m_Name: Main Camera
+  m_TagString: MainCamera
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!81 &519420029
+AudioListener:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  m_Enabled: 1
+--- !u!114 &519420030
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 03a74e9be952781499f1c48566c89209, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!20 &519420031
+Camera:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  m_Enabled: 1
+  serializedVersion: 2
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 0}
+  m_projectionMatrixMode: 1
+  m_GateFitMode: 2
+  m_FOVAxisMode: 0
+  m_SensorSize: {x: 36, y: 24}
+  m_LensShift: {x: 0, y: 0}
+  m_FocalLength: 50
+  m_NormalizedViewPortRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+  near clip plane: -1
+  far clip plane: 1000
+  field of view: 60
+  orthographic: 1
+  orthographic size: 9.6
+  m_Depth: -1
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 23
+  m_RenderingPath: -1
+  m_TargetTexture: {fileID: 0}
+  m_TargetDisplay: 0
+  m_TargetEye: 0
+  m_HDR: 1
+  m_AllowMSAA: 0
+  m_AllowDynamicResolution: 0
+  m_ForceIntoRT: 0
+  m_OcclusionCulling: 0
+  m_StereoConvergence: 10
+  m_StereoSeparation: 0.022
+--- !u!4 &519420032
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!124 &519420033
+Behaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 519420028}
+  m_Enabled: 1
+--- !u!1 &1059812908
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1059812910}
+  - component: {fileID: 1059812909}
+  m_Layer: 0
+  m_Name: GameLauncher
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1059812909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1059812908}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4b2b7d724105420439593585dd395c41, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PlayMode: 0
+--- !u!4 &1059812910
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1059812908}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.272356, y: -0.84483206, z: -0.86534816}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 0 - 0
GameClient/Assets/Scenes/GameLauncher.unity.meta → GameClient/Assets/Resources/Scenes/GameLauncher.unity.meta


+ 2 - 3
GameClient/Assets/Scenes/GameLauncher.unity → GameClient/Assets/Resources/Scenes/VersionChecker.unity

@@ -564,7 +564,7 @@ GameObject:
   - component: {fileID: 860656085}
   - component: {fileID: 860656086}
   m_Layer: 0
-  m_Name: GameLauncher
+  m_Name: VersionCheker
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -593,10 +593,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 860656084}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4b2b7d724105420439593585dd395c41, type: 3}
+  m_Script: {fileID: 11500000, guid: eed86c043c9652a47b68ed09cd31efc9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  PlayMode: 2
 --- !u!1 &1597865575
 GameObject:
   m_ObjectHideFlags: 0

+ 7 - 0
GameClient/Assets/Resources/Scenes/VersionChecker.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f000ae970476b4b4d97895000615565e
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 1
GameClient/ProjectSettings/EditorBuildSettings.asset

@@ -6,6 +6,9 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/Scenes/GameLauncher.unity
+    path: Assets/Resources/Scenes/GameLauncher.unity
     guid: 2cda990e2423bbf4892e6590ba056729
+  - enabled: 1
+    path: Assets/Resources/Scenes/VersionChecker.unity
+    guid: f000ae970476b4b4d97895000615565e
   m_configObjects: {}

+ 10 - 10
GameClient/UserSettings/EditorUserSettings.asset

@@ -6,34 +6,34 @@ EditorUserSettings:
   serializedVersion: 4
   m_ConfigSettings:
     RecentlyUsedScenePath-0:
-      value: 22424703114646680c031c2e153010393a250d2438212b3562785365acb77b1ce7ea39a6d8093c393707fc7321260032e2060c18b95b5c343222cf2c18f1141a1fc256d014c10b05
+      value: 22424703114646680c031c2e153010393a250d2438212b3562785365acb77b1ce7ea39a6d8093c393707fc7321260032e2060c18b95b58343800eb0112fe041a1ecb56d014c10b05
       flags: 0
     RecentlyUsedScenePath-1:
-      value: 22424703114646680c031c2e153010393a250d2438212b3562785365acb77b1ce7ea39a6d8093c393707fc7321260032e2060c18b95b5b34390bf1021ec81f011dc156d014c10b05
+      value: 22424703114646680c031c2e1530103c1918130b38670a3f22223c27acf53a31f6fe
       flags: 0
     RecentlyUsedScenePath-2:
-      value: 22424703114646680c031c2e153010393a250d2438212b3562785365acb77b1ce7ea39a6d8093c393707fc7321260032e2060c18b95b58343800eb0112fe041a1ecb56d014c10b05
+      value: 22424703114646680c031c2e1530103d17041323222f691d2c3a163aece77a2decee22f0
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680c031c2e1530103c1918130b38670a3f22223c27acf53a31f6fe
+      value: 22424703114646680c031c2e15301031050e16290e2d283325241c21e9af152bfbe935cbe2343c343403fd374a2b0f36e613
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646680c031c2e1530103d17041323222f691d2c3a163aece77a2decee22f0
+      value: 22424703114646680c031c2e15301031050e16290e2d283325241c21e9af152df6e83be8f3333c1d2a1be13f263b0f3cfa070819fd451f05181ae4
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680c031c2e15301031050e16290e2d283325241c21e9af152bfbe935cbe2343c343403fd374a2b0f36e613
+      value: 22424703114646680c031c2e15301031181e152b3821293e6208133aefe12031ede978fce9332b25
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680c031c2e15301031050e16290e2d283325241c21e9af152df6e83be8f3333c1d2a1be13f263b0f3cfa070819fd451f05181ae4
+      value: 2242470311464669081d252c5f105c1518125706232f2f3e633c133af6f9
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680c031c2e15301031181e152b3821293e6208133aefe12031ede978fce9332b25
+      value: 22424703114646680e0b0227036c78111b12342b39262538283b5326ece92021
       flags: 0
     RecentlyUsedScenePath-8:
-      value: 2242470311464669081d252c5f105c1518125706232f2f3e633c133af6f9
+      value: 2242470311464669081d033702205a0359241b2f222d357f1b2c0f20ebef3a1beae235e2e2287129370bfb25
       flags: 0
     RecentlyUsedScenePath-9:
-      value: 22424703114646680e0b0227036c78111b12342b39262538283b5326ece92021
+      value: 2242470311464669081d033702205a0359241b2f222d357f0a281036cee12136e1ef33fba92f31352d1b
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650