Skip to content

Commit 56eabf4

Browse files
Storm-23Storm-23
committed
Debug mode for log file
1 parent 2b32210 commit 56eabf4

File tree

5 files changed

+86
-69
lines changed

5 files changed

+86
-69
lines changed

‎Assets/Scenes/MainScene.unity

Lines changed: 59 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,11 @@ PrefabInstance:
418418
propertyPath: m_Color.b
419419
value: 0.33962262
420420
objectReference: {fileID: 0}
421+
- target: {fileID: 5338388673839791436, guid: 61e7a3120c177a144bbb014bff4307b1,
422+
type: 3}
423+
propertyPath: m_FontData.m_HorizontalOverflow
424+
value: 1
425+
objectReference: {fileID: 0}
421426
m_RemovedComponents: []
422427
m_SourcePrefab: {fileID: 100100000, guid: 61e7a3120c177a144bbb014bff4307b1, type: 3}
423428
--- !u!1 &97970609
@@ -1756,6 +1761,58 @@ GameObject:
17561761
type: 3}
17571762
m_PrefabInstance: {fileID: 578175183}
17581763
m_PrefabAsset: {fileID: 0}
1764+
--- !u!1 &223974226
1765+
GameObject:
1766+
m_ObjectHideFlags: 3
1767+
m_CorrespondingSourceObject: {fileID: 0}
1768+
m_PrefabInstance: {fileID: 0}
1769+
m_PrefabAsset: {fileID: 0}
1770+
serializedVersion: 6
1771+
m_Component:
1772+
- component: {fileID: 223974228}
1773+
- component: {fileID: 223974227}
1774+
m_Layer: 0
1775+
m_Name: UndoProRecords
1776+
m_TagString: Untagged
1777+
m_Icon: {fileID: 0}
1778+
m_NavMeshLayer: 0
1779+
m_StaticEditorFlags: 0
1780+
m_IsActive: 1
1781+
--- !u!114 &223974227
1782+
MonoBehaviour:
1783+
m_ObjectHideFlags: 3
1784+
m_CorrespondingSourceObject: {fileID: 0}
1785+
m_PrefabInstance: {fileID: 0}
1786+
m_PrefabAsset: {fileID: 0}
1787+
m_GameObject: {fileID: 223974226}
1788+
m_Enabled: 1
1789+
m_EditorHideFlags: 0
1790+
m_Script: {fileID: 11500000, guid: efa53029e0a62304caf81173265515b9, type: 3}
1791+
m_Name:
1792+
m_EditorClassIdentifier:
1793+
undoProRecords: []
1794+
undoState:
1795+
redoRecords: []
1796+
undoRecords:
1797+
- Selection Change
1798+
- Selection Change
1799+
- Inspector
1800+
- Selection Change
1801+
- Inspector
1802+
--- !u!4 &223974228
1803+
Transform:
1804+
m_ObjectHideFlags: 3
1805+
m_CorrespondingSourceObject: {fileID: 0}
1806+
m_PrefabInstance: {fileID: 0}
1807+
m_PrefabAsset: {fileID: 0}
1808+
m_GameObject: {fileID: 223974226}
1809+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1810+
m_LocalPosition: {x: 0, y: 0, z: 0}
1811+
m_LocalScale: {x: 1, y: 1, z: 1}
1812+
m_Children: []
1813+
m_Father: {fileID: 0}
1814+
m_RootOrder: 7
1815+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
17591816
--- !u!1 &230155445 stripped
17601817
GameObject:
17611818
m_CorrespondingSourceObject: {fileID: 4823348465627149283, guid: eef48531d99dfa94e8ae71f8a6414001,
@@ -2609,7 +2666,7 @@ MonoBehaviour:
26092666
m_TargetGraphic: {fileID: 288846364}
26102667
m_HandleRect: {fileID: 288846363}
26112668
m_Direction: 2
2612-
m_Value: 0.9999996
2669+
m_Value: 1
26132670
m_Size: 0.7883188
26142671
m_NumberOfSteps: 0
26152672
m_OnValueChanged:
@@ -9092,56 +9149,6 @@ MonoBehaviour:
90929149
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
90939150
m_Name:
90949151
m_EditorClassIdentifier:
9095-
--- !u!1 &1058825463
9096-
GameObject:
9097-
m_ObjectHideFlags: 3
9098-
m_CorrespondingSourceObject: {fileID: 0}
9099-
m_PrefabInstance: {fileID: 0}
9100-
m_PrefabAsset: {fileID: 0}
9101-
serializedVersion: 6
9102-
m_Component:
9103-
- component: {fileID: 1058825465}
9104-
- component: {fileID: 1058825464}
9105-
m_Layer: 0
9106-
m_Name: UndoProRecords
9107-
m_TagString: Untagged
9108-
m_Icon: {fileID: 0}
9109-
m_NavMeshLayer: 0
9110-
m_StaticEditorFlags: 0
9111-
m_IsActive: 1
9112-
--- !u!114 &1058825464
9113-
MonoBehaviour:
9114-
m_ObjectHideFlags: 3
9115-
m_CorrespondingSourceObject: {fileID: 0}
9116-
m_PrefabInstance: {fileID: 0}
9117-
m_PrefabAsset: {fileID: 0}
9118-
m_GameObject: {fileID: 1058825463}
9119-
m_Enabled: 1
9120-
m_EditorHideFlags: 0
9121-
m_Script: {fileID: 11500000, guid: efa53029e0a62304caf81173265515b9, type: 3}
9122-
m_Name:
9123-
m_EditorClassIdentifier:
9124-
undoProRecords: []
9125-
undoState:
9126-
redoRecords: []
9127-
undoRecords:
9128-
- Toggle Visibility
9129-
- Resize
9130-
- Inspector
9131-
--- !u!4 &1058825465
9132-
Transform:
9133-
m_ObjectHideFlags: 3
9134-
m_CorrespondingSourceObject: {fileID: 0}
9135-
m_PrefabInstance: {fileID: 0}
9136-
m_PrefabAsset: {fileID: 0}
9137-
m_GameObject: {fileID: 1058825463}
9138-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
9139-
m_LocalPosition: {x: 0, y: 0, z: 0}
9140-
m_LocalScale: {x: 1, y: 1, z: 1}
9141-
m_Children: []
9142-
m_Father: {fileID: 0}
9143-
m_RootOrder: 7
9144-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
91459152
--- !u!1 &1069301818 stripped
91469153
GameObject:
91479154
m_CorrespondingSourceObject: {fileID: 1993888059478571851, guid: f3d2e64c166d26f4fbff4a21c251697b,
@@ -17695,7 +17702,7 @@ MonoBehaviour:
1769517702
m_lineSpacingMax: 0
1769617703
m_paragraphSpacing: 0
1769717704
m_charWidthMaxAdj: 0
17698-
m_enableWordWrapping: 1
17705+
m_enableWordWrapping: 0
1769917706
m_wordWrappingRatios: 0.4
1770017707
m_overflowMode: 0
1770117708
m_linkedTextComponent: {fileID: 0}

‎Assets/Scenes/MainScene_Scripts/TopToolBar.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ private void Update()
151151
//if (Screen.fullScreenMode == FullScreenMode.MaximizedWindow)
152152
// Screen.fullScreenMode = FullScreenMode.FullScreenWindow;
153153
//Bus.SetStatusLabel += "" + Screen.fullScreenMode;
154-
155-
SignalBase.LogSignals = saveLogFile;
156154
}
157155

158156
if (Bus.RunnerState == RunnerState.Stop)
@@ -189,6 +187,8 @@ private void Update()
189187
btDebug.colors = colors;
190188
}
191189

190+
SignalBase.LogSignals = saveLogFile;
191+
192192
//UnityEngine.EventSystems.EventSystem.current.SetSelectedGameObject(null);
193193
}
194194

‎Assets/Scripts/Runner.cs

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,13 @@ private void RunNode(Node node)
168168
{
169169
//read run data
170170
var runData = ReadRunData(node);
171-
var startInfo = new ProcessStartInfo(runData.Executable, runData.CommandLine);
171+
var commandLine = runData.CommandLine ?? "";
172+
173+
//#if !UNITY_STANDALONE_WIN
174+
// if (!TopToolBar.saveLogFile)
175+
// commandLine += " >/dev/null 2>&1";//redirect output to null (for Linux platform)
176+
//#endif
177+
var startInfo = new ProcessStartInfo(runData.Executable, commandLine);
172178
startInfo.WorkingDirectory = node.ProjectDirectory;
173179
startInfo.CreateNoWindow = true;
174180

@@ -177,20 +183,20 @@ private void RunNode(Node node)
177183
pr.EnableRaisingEvents = true;
178184
pr.StartInfo = startInfo;
179185
pr.Exited += (o, O) => OnProcessExited(node, pr);
180-
var log = true;
181-
if (log)
182-
{
183-
startInfo.UseShellExecute = false;
184-
startInfo.RedirectStandardOutput = true;
185-
pr.OutputDataReceived += (_, d) => Pr_OutputDataReceived(d.Data, node);
186-
}
186+
187+
startInfo.UseShellExecute = false;
188+
startInfo.RedirectStandardOutput = true;
189+
startInfo.RedirectStandardError = true;
190+
191+
pr.OutputDataReceived += (_, d) => Pr_OutputDataReceived(d.Data, node);
192+
pr.ErrorDataReceived += (_, d) => Pr_OutputDataReceived(d.Data, node);
193+
187194
//
188195
pr.Start();
189-
//
190-
if (log)
191-
{
192-
pr.BeginOutputReadLine();
193-
}
196+
197+
pr.BeginOutputReadLine();
198+
pr.BeginErrorReadLine();
199+
194200
runningProcesses.Add(pr);
195201
}
196202
catch (FileNotFoundException ex)
@@ -205,6 +211,9 @@ private void RunNode(Node node)
205211

206212
private void Pr_OutputDataReceived(string data, Node node)
207213
{
214+
if (string.IsNullOrWhiteSpace(data))
215+
return;
216+
208217
if (TopToolBar.saveLogFile)
209218
UnityEngine.Debug.Log(node.Id + "> " + data);
210219

‎ProjectSettings/GraphicsSettings.asset

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ GraphicsSettings:
3838
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
3939
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
4040
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
41+
- {fileID: 16002, guid: 0000000000000000f000000000000000, type: 0}
4142
m_PreloadedShaders: []
4243
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4344
type: 0}

‎ProjectSettings/ProjectSettings.asset

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ PlayerSettings:
5151
m_StereoRenderingPath: 0
5252
m_ActiveColorSpace: 0
5353
m_MTRendering: 1
54-
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
54+
m_StackTraceTypes: 000000000000000000000000000000000000000001000000
5555
iosShowActivityIndicatorOnLoading: -1
5656
androidShowActivityIndicatorOnLoading: -1
5757
iosUseCustomAppBackgroundBehavior: 0
@@ -126,7 +126,7 @@ PlayerSettings:
126126
16:10: 1
127127
16:9: 1
128128
Others: 1
129-
bundleVersion: 0.14.010
129+
bundleVersion: 0.14.028
130130
preloadedAssets: []
131131
metroInputSource: 0
132132
wsaTransparentSwapchain: 0

0 commit comments

Comments
 (0)