1

Src/Unity/Scripts/Assets/BITFramework.cs

@@ -142,8 +142,12 @@ namespace BITKit
                     }
                 }
 #endif
+<<<<<<< Updated upstream
                 #if UNITY_5_3_OR_NEWER
                 if (IsEditorSimulateMode is false && isOffline)
+=======
+                if (isOffline&& IsEditorSimulateMode is false)
+>>>>>>> Stashed changes
                 {
                     initParameters = new OfflinePlayModeParameters();
                 }
@@ -159,7 +163,12 @@ namespace BITKit
                 try
                 {
                     initOperation = package.InitializeAsync(initParameters);
-                        _progressLabel.text ="正在初始化资源系统...";
+
+                    var text = $"正在初始化资源系统...,使用{initParameters.GetType().Name}";
+                    
+                        _progressLabel.text =text;
+                        
+                    Debug.Log(text);
                 }
                 catch (Exception e)
                 {