NBC修改

Assets/Scripts/Startup/Init.cs

@@ -8,9 +8,8 @@ using UnityEngine.Video;
 
 namespace NBF
 {
-    public class App : MonoBehaviour
+    public class Init : MonoBehaviour
     {
-        public static App Inst { get; private set; }
         [SerializeField] private VideoPlayer videoPlayer;
         [SerializeField] private GameObject startCanvas;
         [SerializeField] private bool playVideo;
@@ -23,11 +22,8 @@ namespace NBF
 
         private void Awake()
         {
-            Log.Open = true;
-            Inst = this;
             DontDestroyOnLoad(gameObject);
-            
-            // new GameObject("GameManager").AddComponent<GameManager>();
+            App.Init(InitCallback);
         }
 
         private void OnDestroy()
@@ -35,7 +31,7 @@ namespace NBF
             PermanentCommon.Dispose();
         }
 
-        void Start()
+        void InitCallback()
         {
             ES3.Init();
             ES3.Save("NBF", 1);
@@ -49,38 +45,32 @@ namespace NBF
             }
 
             QualitySettings.vSyncCount = 0;
-            // Application.targetFrameRate = 120;
-            // NBC.Asset.Const.Offline = true;
-            // yield return NBC.Asset.Assets.Initialize();
-            Init();
+            InitLanguage();
+            InitService();
+            InitUI();
             if (!playVideo)
             {
                 CheckOver(videoPlayer);
             }
         }
 
-        private void Init()
-        {
-            InitLanguage();
-            InitService();
-            InitUI();
-        }
 
         #region 多语言
 
         private void InitLanguage()
         {
             // var map = LanguageConst.languageMap;
-            Lan.Inst.AddLanguageModule((int)LanguageModuleType.Text, new LanguageText());
-            Lan.Inst.AddLanguageModule((int)LanguageModuleType.Image, new LanguageImage());
-            Lan.Inst.AddLanguageModule((int)LanguageModuleType.Font, new LanguageFont());
 
-            foreach (var key in LanguageConst.languageMap.Keys)
-            {
-                Lan.Inst.AddLanguage(key);
-            }
-
-            UI.Inst.SetUILanguage<UILangeageConfig>();
+            // Lan.Inst.AddLanguageModule((int)LanguageModuleType.Text, new LanguageText());
+            // Lan.Inst.AddLanguageModule((int)LanguageModuleType.Image, new LanguageImage());
+            // Lan.Inst.AddLanguageModule((int)LanguageModuleType.Font, new LanguageFont());
+            //
+            // foreach (var key in LanguageConst.languageMap.Keys)
+            // {
+            //     Lan.Inst.AddLanguage(key);
+            // }
+            //
+            // UI.Inst.SetUILanguage<UILangeageConfig>();
             // Lan.Inst.AutoUseLanguage();
         }
 
@@ -97,14 +87,14 @@ namespace NBF
             UIObjectFactory.SetLoaderExtension(typeof(XGLoader));
             UIConst.UIPackRootUrl = UIDef.UIRoot;
             UIConfig.defaultFont = "AlibabaPuHuiTi-3-Medium";
-            UI.Inst.SetUILanguage<UILangeageConfig>();
+            App.UI.SetUILanguage<UILangeageConfig>();
             UIConfig.modalLayerColor = new Color(0, 0, 0, 0.9f);
             AddUIPackages();
         }
 
         private void AddUIPackages()
         {
-            UI.Inst.AddPackage("Common/Common");
+            App.UI.AddPackage("Common/Common");
         }
 
         #endregion
@@ -139,12 +129,12 @@ namespace NBF
             InputDef.LoadIcon();
             // UI.Inst.OpenUI<FishingShopPanel>();
             LoadData();
-            UI.Inst.OpenUI<CommonTopPanel>();
-            // UI.Inst.OpenUI<FishingPanel>();
-            UI.Inst.OpenUI<PreviewPanel>();
+            CommonTopPanel.Show();
+            // FishingPanel.Show();
+            PreviewPanel.Show();
             // Fishing.Inst.Go(1);
-            // UI.Inst.OpenUI<SettingPanel>();
-            // UI.Inst.OpenUI<HomePanel>();
+            // SettingPanel.Show();
+            // HomePanel.Show();
         }
 
         private void LoadData()