nothing

BBpezsgo · Jan 12, 2025 · 46976a6 · 46976a6
1 parent 17ca82c
commit 46976a6
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/Assets/Mono/Client/TerminalManager.cs b/Assets/Mono/Client/TerminalManager.cs
@@ -377,7 +377,7 @@ static void AppendProgressBar(StringBuilder builder, string label, float progres
                     }
                 }
 
-                if (!float.IsNaN(source.Progress) && source.Progress != 1f)
+                if (source.Status != CompilationStatus.Done && !float.IsNaN(source.Progress))
                 {
                     const int progressBarWidth = 10;
 

diff --git a/Assets/Mono/Common/ConnectionManager.cs b/Assets/Mono/Common/ConnectionManager.cs
@@ -113,7 +113,9 @@ public IEnumerator StartHostAsync(NetworkEndpoint endpoint)
 
         UI.gameObject.SetActive(false);
 
-        // SetupManager.Instance.Setup();
+#if UNITY_EDITOR && EDITOR_DEBUG
+        SetupManager.Instance.Setup();
+#endif
     }
 
     public IEnumerator StartClientAsync(NetworkEndpoint endpoint)

diff --git a/Assets/Prefabs/DebugLines.prefab b/Assets/Prefabs/DebugLines.prefab
@@ -18,7 +18,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &7049668941679087302
 Transform:

diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity
@@ -130,7 +130,7 @@ GameObject:
   - component: {fileID: 192343620}
   - component: {fileID: 192343621}
   - component: {fileID: 192343622}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: HUD
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -194,7 +194,7 @@ GameObject:
   m_Component:
   - component: {fileID: 326294559}
   - component: {fileID: 326294560}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Network
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -435,7 +435,7 @@ GameObject:
   m_Component:
   - component: {fileID: 387110818}
   - component: {fileID: 387110817}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Building
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -486,7 +486,7 @@ GameObject:
   m_Component:
   - component: {fileID: 387753433}
   - component: {fileID: 387753434}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: UnitCommands
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -702,7 +702,7 @@ GameObject:
   m_Component:
   - component: {fileID: 444809115}
   - component: {fileID: 444809116}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Facility
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -854,7 +854,7 @@ GameObject:
   m_Component:
   - component: {fileID: 814073990}
   - component: {fileID: 814073991}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Factory
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1007,7 +1007,7 @@ GameObject:
   - component: {fileID: 1042564337}
   - component: {fileID: 1042564339}
   - component: {fileID: 1042564338}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: UI
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1274,7 +1274,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1605264180}
   - component: {fileID: 1605264183}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Canvas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1368,7 +1368,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 89984eadfd7d09bb2850b5543089be3d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  SpawnExactUnits: 1
+  SpawnExactUnits: 0
   Units:
   - Prefab: {fileID: 2099412289264216910, guid: 2433642d39f17be6aa8ad8c596976581, type: 3}
     Spawn:
@@ -1396,7 +1396,7 @@ MonoBehaviour:
     Team: 1
   Team: 1
   GeneratedScript: unit-4.bbc
-  GeneratedCount: 0
+  GeneratedCount: 6
   Start: {x: -20, y: -20}
   End: {x: 20, y: 20}
   RandomUnitPrefab: {fileID: 2198220952844499968, guid: 95f9e0627990352efa94411860d0a894, type: 3}
@@ -1549,7 +1549,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1848802882}
   - component: {fileID: 1848802881}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Unit
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1788,7 +1788,7 @@ GameObject:
   - component: {fileID: 2036511787}
   - component: {fileID: 2036511789}
   - component: {fileID: 2036511788}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: SelectionBox
   m_TagString: Untagged
   m_Icon: {fileID: 0}
@@ -1862,7 +1862,7 @@ GameObject:
   m_Component:
   - component: {fileID: 2075893408}
   - component: {fileID: 2075893409}
-  m_Layer: 0
+  m_Layer: 5
   m_Name: Pause
   m_TagString: Untagged
   m_Icon: {fileID: 0}

diff --git a/Assets/SubScenes/Entities.unity b/Assets/SubScenes/Entities.unity
@@ -414,7 +414,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &762009498
 Transform:
@@ -557,7 +557,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &1152522258
 Transform:
@@ -605,7 +605,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 0
 --- !u!114 &1342948021
 MonoBehaviour:
@@ -794,7 +794,7 @@ GameObject:
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
+  m_StaticEditorFlags: 2147483647
   m_IsActive: 1
 --- !u!4 &1673806253
 Transform:
-Original file line number
+Diff line change
@@ Expand Up @@
                         }
                     }
-                    if (!float.IsNaN(source.Progress) && source.Progress != 1f)
+                    if (source.Status != CompilationStatus.Done && !float.IsNaN(source.Progress))
                     {
                         const int progressBarWidth = 10;
@@ Expand Down @@