1

2024-12-26 18:00:56 +08:00 · 2024-12-26 18:00:56 +08:00 · 47547df963
parent c79782b307
commit 47547df963
1 changed files with 1 additions and 12 deletions
--- a/Src/Unity/Scripts/Assets/BITFramework.cs
+++ b/Src/Unity/Scripts/Assets/BITFramework.cs
@ -142,22 +142,11 @@ 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();
                }
-                #else
-                    if (isOffline)
-                {
-                    initParameters = new OfflinePlayModeParameters();
-                }
-                #endif
-               

                InitializationOperation initOperation = null;
                try