diff --git a/.gitignore b/.gitignore index 8b634f6a0..3b07f1932 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,8 @@ !/Assets/StreamingAssets/Data/Mods/README.md.meta /[Pp]roject[Ss]ettings/ProjectVersion.txt /[Pp]roject[Ss]ettings/GraphicsSettings.asset +/Assets/Resources/ChannelSettings.asset +/Assets/Resources/ChannelSettings.asset.meta # Autogenerated VS/MD solution and project files ExportedObj/ diff --git a/Assets/Editor/DebuggerChannelControl.cs b/Assets/Editor/DebuggerChannelControl.cs new file mode 100644 index 000000000..9c569d570 --- /dev/null +++ b/Assets/Editor/DebuggerChannelControl.cs @@ -0,0 +1,104 @@ +#region License +// ==================================================== +// Project Porcupine Copyright(C) 2016 Team Porcupine +// This program comes with ABSOLUTELY NO WARRANTY; This is free software, +// and you are welcome to redistribute it under certain conditions; See +// file LICENSE, which is part of this source code package, for details. +// ==================================================== +#endregion + +using System.Collections.Generic; +using System.Linq; +using UnityEditor; +using UnityEngine; + +public class DebuggerChannelControl : EditorWindow +{ + private EditorWindow window; + + private bool allState; + private bool allPreveState; + private ChannelSettingsSO channelSettings; + private Vector2 scrollViewVector = Vector2.down; + + [MenuItem("Window/Debugger Channel Control")] + public static void ShowWindow() + { + GetWindow(typeof(DebuggerChannelControl)); + } + + private void Awake() + { + channelSettings = Resources.Load("ChannelSettings"); + if (channelSettings == null) + { + channelSettings = ScriptableObject.CreateInstance(); + AssetDatabase.CreateAsset(channelSettings, "Assets/Resources/ChannelSettings.asset"); + AssetDatabase.SaveAssets(); + } + + allState = channelSettings.DefaultState; + allPreveState = allState; + } + + private void OnGUI() + { + bool dirtySettings = false; + scrollViewVector = GUILayout.BeginScrollView(scrollViewVector); + EditorGUILayout.BeginVertical("Box"); + bool allStateChanged = false; + allState = GUILayout.Toggle(allState, "All"); + + if (allState != allPreveState) + { + allPreveState = allState; + allStateChanged = true; + channelSettings.DefaultState = allState; + dirtySettings = true; + } + + if (UnityDebugger.Debugger.Channels != null) + { + Dictionary toggleReturns = new Dictionary(); + foreach (string channelName in UnityDebugger.Debugger.Channels.Keys.AsEnumerable()) + { + toggleReturns.Add(channelName, GUILayout.Toggle(UnityDebugger.Debugger.Channels[channelName], channelName)); + if (allStateChanged) + { + toggleReturns[channelName] = allState; + } + } + + foreach (string channelName in toggleReturns.Keys.ToList()) + { + UnityDebugger.Debugger.Channels[channelName] = toggleReturns[channelName]; + + if (channelSettings == null) + { + // We're in a weird state with no channelSettings, just bail 'til we get it back. + return; + } + + if (!channelSettings.ChannelState.ContainsKey(channelName) && toggleReturns.ContainsKey(channelName)) + { + bool theValueIWant = toggleReturns[channelName]; + channelSettings.ChannelState.Add(channelName, theValueIWant); + dirtySettings = true; + } + else if (channelSettings.ChannelState[channelName] != toggleReturns[channelName]) + { + channelSettings.ChannelState[channelName] = toggleReturns[channelName]; + dirtySettings = true; + } + } + } + + if (dirtySettings) + { + EditorUtility.SetDirty(channelSettings); + } + + EditorGUILayout.EndVertical(); + GUILayout.EndScrollView(); + } +} \ No newline at end of file diff --git a/Assets/UberLogger/UberLoggerFile.cs.meta b/Assets/Editor/DebuggerChannelControl.cs.meta similarity index 76% rename from Assets/UberLogger/UberLoggerFile.cs.meta rename to Assets/Editor/DebuggerChannelControl.cs.meta index f4b406b3d..f39cf1519 100644 --- a/Assets/UberLogger/UberLoggerFile.cs.meta +++ b/Assets/Editor/DebuggerChannelControl.cs.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: b5a6acaaa5d694ea0a4f19ef3235bbeb -timeCreated: 1437774614 +guid: 07c655dc1ca03254f87dcc64cd47ecb9 +timeCreated: 1479869589 licenseType: Free MonoImporter: serializedVersion: 2 diff --git a/Assets/Editor/SpriteToXML.cs b/Assets/Editor/SpriteToXML.cs index 566c0faf5..61709441e 100644 --- a/Assets/Editor/SpriteToXML.cs +++ b/Assets/Editor/SpriteToXML.cs @@ -171,7 +171,7 @@ private void ShowVersion1() if (images.Length > 1) { - Debug.ULogErrorChannel("SpriteToXML", "Place only one sprite in 'Resources/Editor/SpriteToXML'"); + UnityDebugger.Debugger.LogError("SpriteToXML", "Place only one sprite in 'Resources/Editor/SpriteToXML'"); return; } @@ -191,16 +191,16 @@ private void ShowVersion1() private void ExportSprites() { - Debug.ULogChannel("SpriteToXML", "Files saved to: " + outputDirPath); + UnityDebugger.Debugger.Log("SpriteToXML", "Files saved to: " + outputDirPath); foreach (string fn in filesInDir) { - Debug.ULogChannel("SpriteToXML", "files in dir: " + fn); + UnityDebugger.Debugger.Log("SpriteToXML", "files in dir: " + fn); } foreach (Texture2D t in images) { - Debug.ULogChannel("SpriteToXML", "Filename: " + t.name); + UnityDebugger.Debugger.Log("SpriteToXML", "Filename: " + t.name); } WriteXml(); @@ -210,7 +210,7 @@ private void WriteXml() { if (outputDirPath == string.Empty) { - Debug.ULogErrorChannel("SpriteToXML", "Please select a folder"); + UnityDebugger.Debugger.LogError("SpriteToXML", "Please select a folder"); return; } @@ -384,7 +384,7 @@ private void ShowVersion2() if ((columnIndex == 0 && rowIndex == 0) && isMultipleSprite == true) { EditorUtility.DisplayDialog("Select proper Row/Column count", "Please select more than 1 Row/Column!", "OK"); - Debug.ULogErrorChannel("SpriteToXML", "Please select more than 1 Row/Column"); + UnityDebugger.Debugger.LogError("SpriteToXML", "Please select more than 1 Row/Column"); } else { @@ -424,7 +424,7 @@ private void LoadImage(string filePath) myTexture = imageTexture; imageName = Path.GetFileNameWithoutExtension(filePath); imageExt = Path.GetExtension(filePath); - Debug.ULogChannel("SpriteToXML", imageName + " Loaded"); + UnityDebugger.Debugger.Log("SpriteToXML", imageName + " Loaded"); textureLoaded = true; } } @@ -516,18 +516,18 @@ private void MoveImage(string filePath) try { File.Replace(filePath, destPath, destPath + ".bak"); - Debug.ULogWarningChannel("SpriteToXML", "Image already exsists, backing old one up to: " + destPath + ".bak"); + UnityDebugger.Debugger.LogWarning("SpriteToXML", "Image already exsists, backing old one up to: " + destPath + ".bak"); } catch (Exception ex) { - Debug.ULogWarningChannel("SpriteToXML", ex.Message + " - " + imageName + imageExt + " not moved."); + UnityDebugger.Debugger.LogWarning("SpriteToXML", ex.Message + " - " + imageName + imageExt + " not moved."); EditorUtility.DisplayDialog(imageName + imageExt + " not moved.", "The original and output directories cannot be the same!" + "\n\n" + "XML was still generated.", "OK"); } } else { File.Move(filePath, destPath); - Debug.ULogChannel("SpriteToXML", "Image moved to: " + destPath); + UnityDebugger.Debugger.Log("SpriteToXML", "Image moved to: " + destPath); } if (File.Exists(filePath + ".meta") && File.Exists(destPath + ".meta")) @@ -538,7 +538,7 @@ private void MoveImage(string filePath) } catch (Exception ex) { - Debug.ULogWarningChannel("SpriteToXML", ex.Message + " - " + imageName + imageExt + ".meta not moved."); + UnityDebugger.Debugger.LogWarning("SpriteToXML", ex.Message + " - " + imageName + imageExt + ".meta not moved."); } } else diff --git a/Assets/Editor/UnitTests/Controllers/HeadlineGeneratorTest.cs b/Assets/Editor/UnitTests/Controllers/HeadlineGeneratorTest.cs index 1c08ac58f..01648437f 100644 --- a/Assets/Editor/UnitTests/Controllers/HeadlineGeneratorTest.cs +++ b/Assets/Editor/UnitTests/Controllers/HeadlineGeneratorTest.cs @@ -33,12 +33,11 @@ public void SetUp() gen = new HeadlineGenerator(); gen.UpdatedHeadline += StringPrinted; stringPrinted = false; - Debug.IsLogEnabled = false; } public void StringPrinted(string headline) { - Debug.Log(headline); + UnityDebugger.Debugger.Log(headline); stringPrinted = true; } diff --git a/Assets/Editor/UnitTests/Models/Functions/CSharpFunctionsTest.cs b/Assets/Editor/UnitTests/Models/Functions/CSharpFunctionsTest.cs index b2d11d419..59a82ad7a 100644 --- a/Assets/Editor/UnitTests/Models/Functions/CSharpFunctionsTest.cs +++ b/Assets/Editor/UnitTests/Models/Functions/CSharpFunctionsTest.cs @@ -39,7 +39,6 @@ public static string PowerCellPress_StatusInfo(Furniture furniture) [SetUp] public void Init() { - Debug.IsLogEnabled = false; functions = new CSharpFunctions(); } diff --git a/Assets/Editor/UnitTests/Models/Functions/FunctionsTest.cs b/Assets/Editor/UnitTests/Models/Functions/FunctionsTest.cs index d14fe4fee..6292f888b 100644 --- a/Assets/Editor/UnitTests/Models/Functions/FunctionsTest.cs +++ b/Assets/Editor/UnitTests/Models/Functions/FunctionsTest.cs @@ -40,7 +40,6 @@ function PowerGenerator_FuelInfo(furniture) [SetUp] public void Init() { - Debug.IsLogEnabled = true; csharpFunctions = new CSharpFunctions(); luaFunctions = new LuaFunctions(); } @@ -76,9 +75,9 @@ public void CompareLUAvsCSharp() sw2.Stop(); - Debug.Log(string.Format("Iterations: {0}", cache.Count / 2)); - Debug.Log(string.Format("CSharp calls: {0} ms", sw1.ElapsedMilliseconds)); - Debug.Log(string.Format("LUA calls: {0} ms", sw2.ElapsedMilliseconds)); + UnityDebugger.Debugger.Log(string.Format("Iterations: {0}", cache.Count / 2)); + UnityDebugger.Debugger.Log(string.Format("CSharp calls: {0} ms", sw1.ElapsedMilliseconds)); + UnityDebugger.Debugger.Log(string.Format("LUA calls: {0} ms", sw2.ElapsedMilliseconds)); } private string ReplaceQuotes(string text) diff --git a/Assets/Editor/UnitTests/Models/Functions/LuaFunctionsTest.cs b/Assets/Editor/UnitTests/Models/Functions/LuaFunctionsTest.cs index 10ed35117..d5aa985fe 100644 --- a/Assets/Editor/UnitTests/Models/Functions/LuaFunctionsTest.cs +++ b/Assets/Editor/UnitTests/Models/Functions/LuaFunctionsTest.cs @@ -45,7 +45,6 @@ function test_func2() [SetUp] public void Init() { - Debug.IsLogEnabled = false; functions = new LuaFunctions(); } diff --git a/Assets/Editor/UnitTests/Models/ScheduledEventTest.cs b/Assets/Editor/UnitTests/Models/ScheduledEventTest.cs index 0ea56f350..edb805394 100644 --- a/Assets/Editor/UnitTests/Models/ScheduledEventTest.cs +++ b/Assets/Editor/UnitTests/Models/ScheduledEventTest.cs @@ -19,10 +19,9 @@ public class ScheduledEventTest [SetUp] public void Init() { - Debug.IsLogEnabled = false; callback = (evt) => { - Debug.ULogChannel("ScheduledEventTest", "Event {0} fired", evt.Name); + UnityDebugger.Debugger.LogFormat("ScheduledEventTest", "Event {0} fired", evt.Name); didRun = true; runCount++; }; @@ -33,7 +32,7 @@ public void EventCreationTest() { ScheduledEvent evt = new ScheduledEvent( "test", - (ev) => Debug.ULogChannel("ScheduledEventTest", "Event {0} fired", ev.Name), + (ev) => UnityDebugger.Debugger.LogFormat("ScheduledEventTest", "Event {0} fired", ev.Name), 3.0f, true, 1); @@ -45,7 +44,7 @@ public void EventCreationTest() Assert.That(evt, Is.Not.EqualTo(evt2)); ScheduledEvent evt3 = new ScheduledEvent( - new ScheduledEvent("test", (ev) => Debug.ULogChannel("ScheduledEventTest", "Event {0} fired", ev.Name)), + new ScheduledEvent("test", (ev) => UnityDebugger.Debugger.LogFormat("ScheduledEventTest", "Event {0} fired", ev.Name)), 1.0f, 0.5f, false, @@ -197,7 +196,7 @@ public void LargeDeltaTimeEventRunTest() ScheduledEvent evt = new ScheduledEvent( "test", - (ev) => { tally++; Debug.ULogChannel("ScheduledEventTest", "Event {0} fired", ev.Name); }, + (ev) => { tally++; UnityDebugger.Debugger.LogFormat("ScheduledEventTest", "Event {0} fired", ev.Name); }, 3.0f, true, 0); @@ -245,7 +244,7 @@ public void ToJsonTest() { ScheduledEvent evt = new ScheduledEvent( "test", - (ev) => Debug.ULogChannel("ScheduledEventTest", "Event {0} fired", ev.Name), + (ev) => UnityDebugger.Debugger.LogFormat("ScheduledEventTest", "Event {0} fired", ev.Name), 3.0f, true, 1); diff --git a/Assets/Editor/UnitTests/Models/SchedulerEditorTest.cs b/Assets/Editor/UnitTests/Models/SchedulerEditorTest.cs index e470cf345..e405ebb14 100644 --- a/Assets/Editor/UnitTests/Models/SchedulerEditorTest.cs +++ b/Assets/Editor/UnitTests/Models/SchedulerEditorTest.cs @@ -32,8 +32,6 @@ function ping_log_lua(event) [SetUp] public void Init() { - Debug.IsLogEnabled = false; - if (FunctionsManager.ScheduledEvent == null) { new FunctionsManager(); @@ -46,14 +44,14 @@ public void Init() new PrototypeManager(); } - PrototypeManager.ScheduledEvent.Add(new ScheduledEvent("ping_log", evt => Debug.ULogChannel("Scheduler", "Event {0} fired", evt.Name))); + PrototypeManager.ScheduledEvent.Add(new ScheduledEvent("ping_log", evt => UnityDebugger.Debugger.LogFormat("Scheduler", "Event {0} fired", evt.Name))); PrototypeManager.ScheduledEvent.LoadPrototypes(XmlPrototypeString); // The problem with unit testing singletons ///scheduler = Scheduler.Scheduler.Current; scheduler = new Scheduler.Scheduler(); - callback = evt => Debug.ULogChannel("SchedulerTest", "Event {0} fired", evt.Name); + callback = evt => UnityDebugger.Debugger.LogFormat("SchedulerTest", "Event {0} fired", evt.Name); } [Test] diff --git a/Assets/Editor/UnitTests/Utilities/ParametersEditorTest.cs b/Assets/Editor/UnitTests/Utilities/ParametersEditorTest.cs index 033e74279..834badb15 100644 --- a/Assets/Editor/UnitTests/Utilities/ParametersEditorTest.cs +++ b/Assets/Editor/UnitTests/Utilities/ParametersEditorTest.cs @@ -22,7 +22,6 @@ public class ParametersEditorTest [SetUp] public void Init() { - Debug.IsLogEnabled = false; xmlTest1 = @" diff --git a/Assets/Plugins/UnityDebugger.dll b/Assets/Plugins/UnityDebugger.dll new file mode 100644 index 000000000..04fa46925 Binary files /dev/null and b/Assets/Plugins/UnityDebugger.dll differ diff --git a/Assets/Plugins/UnityDebugger.dll.meta b/Assets/Plugins/UnityDebugger.dll.meta new file mode 100644 index 000000000..dc9a9b820 --- /dev/null +++ b/Assets/Plugins/UnityDebugger.dll.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: efb95d7eb58424449b848614e6a55822 +timeCreated: 1480492548 +licenseType: Free +PluginImporter: + serializedVersion: 1 + iconMap: {} + executionOrder: {} + isPreloaded: 0 + platformData: + Any: + enabled: 1 + settings: {} + Editor: + enabled: 0 + settings: + DefaultValueInitialized: true + WindowsStoreApps: + enabled: 0 + settings: + CPU: AnyCPU + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Controllers/InputOutput/BuildModeController.cs b/Assets/Scripts/Controllers/InputOutput/BuildModeController.cs index 1eb51ea43..9f4ccb3ec 100644 --- a/Assets/Scripts/Controllers/InputOutput/BuildModeController.cs +++ b/Assets/Scripts/Controllers/InputOutput/BuildModeController.cs @@ -153,7 +153,7 @@ public void DoBuild(Tile tile) } else { - Debug.ULogErrorChannel("BuildModeController", "There is no furniture job prototype for '" + furnitureType + "'"); + UnityDebugger.Debugger.LogError("BuildModeController", "There is no furniture job prototype for '" + furnitureType + "'"); job = new Job(tile, furnitureType, World.Current.FurnitureManager.ConstructJobCompleted, 0.1f, null, Job.JobPriority.High); job.adjacent = true; job.Description = "job_build_" + furnitureType + "_desc"; @@ -229,7 +229,7 @@ public void DoBuild(Tile tile) } else { - Debug.ULogErrorChannel("BuildModeController", "There is no furniture job prototype for '" + utilityType + "'"); + UnityDebugger.Debugger.LogError("BuildModeController", "There is no furniture job prototype for '" + utilityType + "'"); job = new Job(tile, utilityType, World.Current.UtilityManager.ConstructJobCompleted, 0.1f, null, Job.JobPriority.High); job.Description = "job_build_" + utilityType + "_desc"; } @@ -315,7 +315,7 @@ public void DoBuild(Tile tile) if (vacuumNeighbors > 0 && pressuredNeighbors > 0) { - Debug.ULogChannel("BuildModeController", "Someone tried to deconstruct a wall between a pressurized room and vacuum!"); + UnityDebugger.Debugger.Log("BuildModeController", "Someone tried to deconstruct a wall between a pressurized room and vacuum!"); return; } } @@ -333,7 +333,7 @@ public void DoBuild(Tile tile) } else { - Debug.ULogErrorChannel("BuildModeController", "UNIMPLEMENTED BUILD MODE"); + UnityDebugger.Debugger.LogError("BuildModeController", "UNIMPLEMENTED BUILD MODE"); } } diff --git a/Assets/Scripts/Controllers/ShipSpriteController.cs b/Assets/Scripts/Controllers/ShipSpriteController.cs index 91bc79dce..d7d892ea4 100644 --- a/Assets/Scripts/Controllers/ShipSpriteController.cs +++ b/Assets/Scripts/Controllers/ShipSpriteController.cs @@ -19,7 +19,7 @@ public ShipSpriteController(World world) : base(world, "Ships") protected override void OnCreated(Ship ship) { - Debug.ULogChannel("Ships", "Ship created: " + ship.Type); + UnityDebugger.Debugger.Log("Ships", "Ship created: " + ship.Type); GameObject ship_go = new GameObject(); diff --git a/Assets/Scripts/Controllers/Sprites/CharacterSpriteController.cs b/Assets/Scripts/Controllers/Sprites/CharacterSpriteController.cs index 829f0f72e..61a24c995 100644 --- a/Assets/Scripts/Controllers/Sprites/CharacterSpriteController.cs +++ b/Assets/Scripts/Controllers/Sprites/CharacterSpriteController.cs @@ -122,7 +122,7 @@ protected override void OnChanged(Character character) if (objectGameObjectMap.ContainsKey(character) == false) { - Debug.ULogErrorChannel("CharacterSpriteController", "OnCharacterChanged -- trying to change visuals for character not in our map."); + UnityDebugger.Debugger.LogError("CharacterSpriteController", "OnCharacterChanged -- trying to change visuals for character not in our map."); return; } diff --git a/Assets/Scripts/Controllers/Sprites/FurnitureSpriteController.cs b/Assets/Scripts/Controllers/Sprites/FurnitureSpriteController.cs index cf1699e76..28b8d5c27 100644 --- a/Assets/Scripts/Controllers/Sprites/FurnitureSpriteController.cs +++ b/Assets/Scripts/Controllers/Sprites/FurnitureSpriteController.cs @@ -184,7 +184,7 @@ protected override void OnChanged(Furniture furn) // Make sure the furniture's graphics are correct. if (objectGameObjectMap.ContainsKey(furn) == false) { - Debug.ULogErrorChannel("FurnitureSpriteController", "OnFurnitureChanged -- trying to change visuals for furniture not in our map."); + UnityDebugger.Debugger.LogError("FurnitureSpriteController", "OnFurnitureChanged -- trying to change visuals for furniture not in our map."); return; } @@ -232,7 +232,7 @@ protected override void OnRemoved(Furniture furn) { if (objectGameObjectMap.ContainsKey(furn) == false) { - Debug.ULogErrorChannel("FurnitureSpriteController", "OnFurnitureRemoved -- trying to change visuals for furniture not in our map."); + UnityDebugger.Debugger.LogError("FurnitureSpriteController", "OnFurnitureRemoved -- trying to change visuals for furniture not in our map."); return; } diff --git a/Assets/Scripts/Controllers/Sprites/InventorySpriteController.cs b/Assets/Scripts/Controllers/Sprites/InventorySpriteController.cs index 13576ee00..0d17bdf4e 100644 --- a/Assets/Scripts/Controllers/Sprites/InventorySpriteController.cs +++ b/Assets/Scripts/Controllers/Sprites/InventorySpriteController.cs @@ -64,7 +64,7 @@ protected override void OnCreated(Inventory inventory) sr.sprite = SpriteManager.GetSprite("Inventory", inventory.Type); if (sr.sprite == null) { - Debug.ULogErrorChannel("InventorySpriteController", "No sprite for: " + inventory.Type); + UnityDebugger.Debugger.LogError("InventorySpriteController", "No sprite for: " + inventory.Type); } sr.sortingLayerName = "Inventory"; @@ -90,7 +90,7 @@ protected override void OnChanged(Inventory inventory) // Make sure the furniture's graphics are correct. if (objectGameObjectMap.ContainsKey(inventory) == false) { - Debug.ULogErrorChannel("InventorySpriteController", "OnCharacterChanged -- trying to change visuals for inventory not in our map."); + UnityDebugger.Debugger.LogError("InventorySpriteController", "OnCharacterChanged -- trying to change visuals for inventory not in our map."); return; } diff --git a/Assets/Scripts/Controllers/Sprites/TileSpriteController.cs b/Assets/Scripts/Controllers/Sprites/TileSpriteController.cs index a51e40cc3..cb186622c 100644 --- a/Assets/Scripts/Controllers/Sprites/TileSpriteController.cs +++ b/Assets/Scripts/Controllers/Sprites/TileSpriteController.cs @@ -64,7 +64,7 @@ protected override void OnChanged(Tile tile) { if (objectGameObjectMap.ContainsKey(tile) == false) { - Debug.ULogErrorChannel("TileSpriteController", "tileGameObjectMap doesn't contain the tile_data -- did you forget to add the tile to the dictionary? Or maybe forget to unregister a callback?"); + UnityDebugger.Debugger.LogError("TileSpriteController", "tileGameObjectMap doesn't contain the tile_data -- did you forget to add the tile to the dictionary? Or maybe forget to unregister a callback?"); return; } @@ -72,7 +72,7 @@ protected override void OnChanged(Tile tile) if (tile_go == null) { - Debug.ULogErrorChannel("TileSpriteController", "tileGameObjectMap's returned GameObject is null -- did you forget to add the tile to the dictionary? Or maybe forget to unregister a callback?"); + UnityDebugger.Debugger.LogError("TileSpriteController", "tileGameObjectMap's returned GameObject is null -- did you forget to add the tile to the dictionary? Or maybe forget to unregister a callback?"); return; } diff --git a/Assets/Scripts/Controllers/Sprites/UtilitySpriteController.cs b/Assets/Scripts/Controllers/Sprites/UtilitySpriteController.cs index d17696681..f84a12870 100644 --- a/Assets/Scripts/Controllers/Sprites/UtilitySpriteController.cs +++ b/Assets/Scripts/Controllers/Sprites/UtilitySpriteController.cs @@ -101,7 +101,7 @@ protected override void OnChanged(Utility util) // Make sure the utility's graphics are correct. if (objectGameObjectMap.ContainsKey(util) == false) { - Debug.ULogErrorChannel("UtilitySpriteController", "OnUtilityChanged -- trying to change visuals for utility not in our map."); + UnityDebugger.Debugger.LogError("UtilitySpriteController", "OnUtilityChanged -- trying to change visuals for utility not in our map."); return; } @@ -115,7 +115,7 @@ protected override void OnRemoved(Utility util) { if (objectGameObjectMap.ContainsKey(util) == false) { - Debug.ULogErrorChannel("UtilitySpriteController", "OnUtilityRemoved -- trying to change visuals for utility not in our map."); + UnityDebugger.Debugger.LogError("UtilitySpriteController", "OnUtilityRemoved -- trying to change visuals for utility not in our map."); return; } diff --git a/Assets/Scripts/Controllers/WorldController.cs b/Assets/Scripts/Controllers/WorldController.cs index 73bd8830a..2ae02109a 100644 --- a/Assets/Scripts/Controllers/WorldController.cs +++ b/Assets/Scripts/Controllers/WorldController.cs @@ -46,10 +46,9 @@ public class WorldController : MonoBehaviour // Use this for initialization. public void OnEnable() { - Debug.IsLogEnabled = true; if (Instance != null) { - Debug.ULogErrorChannel("WorldController", "There should never be two world controllers."); + UnityDebugger.Debugger.LogError("WorldController", "There should never be two world controllers."); } Instance = this; @@ -64,7 +63,7 @@ public void OnEnable() PrototypeManager.ScheduledEvent.Add( new ScheduledEvent( "ping_log", - (evt) => Debug.ULogChannel("Scheduler", "Event {0} fired", evt.Name))); + (evt) => UnityDebugger.Debugger.LogFormat("Scheduler", "Event {0} fired", evt.Name))); modsManager = new ModsManager(); @@ -232,7 +231,7 @@ private void CreateEmptyWorld() private void CreateWorldFromSaveFile(string fileName) { - Debug.ULogChannel("WorldController", "CreateWorldFromSaveFile"); + UnityDebugger.Debugger.Log("WorldController", "CreateWorldFromSaveFile"); World = new World(); World.ReadJson(fileName); diff --git a/Assets/Scripts/Localization/LocalizationDownloader.cs b/Assets/Scripts/Localization/LocalizationDownloader.cs index 39468ecdf..a5fa02384 100644 --- a/Assets/Scripts/Localization/LocalizationDownloader.cs +++ b/Assets/Scripts/Localization/LocalizationDownloader.cs @@ -73,8 +73,8 @@ public static IEnumerator CheckIfCurrentLocalizationIsUpToDate(Action onLocaliza if (string.IsNullOrEmpty(versionChecker.error) == false) { // This could be a thing when for example user has no internet connection. - Debug.ULogErrorChannel("LocalizationDownloader", "Error while checking for localization updates. Are you sure that you're connected to the internet?"); - Debug.ULogErrorChannel("LocalizationDownloader", versionChecker.error); + UnityDebugger.Debugger.LogError("LocalizationDownloader", "Error while checking for localization updates. Are you sure that you're connected to the internet?"); + UnityDebugger.Debugger.LogError("LocalizationDownloader", versionChecker.error); yield break; } @@ -89,7 +89,7 @@ public static IEnumerator CheckIfCurrentLocalizationIsUpToDate(Action onLocaliza } catch (Exception e) { - Debug.ULogErrorChannel("LocalizationDownloader", e.Message); + UnityDebugger.Debugger.LogError("LocalizationDownloader", e.Message); } if (latestCommitHash != currentLocalizationVersion) @@ -97,7 +97,7 @@ public static IEnumerator CheckIfCurrentLocalizationIsUpToDate(Action onLocaliza // There are still some updates available. We should probably notify // user about it and offer him an option to download it right now. // For now... Let's just force it >.> Beginners task! - Debug.ULogChannel("LocalizationDownloader", "There is an update for localization files!"); + UnityDebugger.Debugger.Log("LocalizationDownloader", "There is an update for localization files!"); yield return DownloadLocalizationFromWeb(onLocalizationDownloadedCallback); // Because config.xml exists in the new downloaded localization, we have to add the version element to it. @@ -117,7 +117,7 @@ public static IEnumerator CheckIfCurrentLocalizationIsUpToDate(Action onLocaliza { // Not a big deal: // Next time the LocalizationDownloader will force an update. - Debug.ULogWarningChannel("LocalizationDownloader", "Writing version in config.xml file failed: " + e.Message); + UnityDebugger.Debugger.LogWarning("LocalizationDownloader", "Writing version in config.xml file failed: " + e.Message); throw; } } @@ -134,14 +134,14 @@ private static IEnumerator DownloadLocalizationFromWeb(Action onLocalizationDown www.Dispose(); } - Debug.ULogChannel("LocalizationDownloader", "Localization files download has started"); + UnityDebugger.Debugger.Log("LocalizationDownloader", "Localization files download has started"); www = new WWW(LocalizationRepositoryZipLocation); // Wait for www to download current localization files. yield return www; - Debug.ULogChannel("LocalizationDownloader", "Localization files download has finished!"); + UnityDebugger.Debugger.Log("LocalizationDownloader", "Localization files download has finished!"); // Almost like a callback call OnDownloadLocalizationComplete(onLocalizationDownloadedCallback); @@ -156,7 +156,7 @@ private static void OnDownloadLocalizationComplete(Action onLocalizationDownload if (www.isDone == false) { // This should never happen. - Debug.ULogErrorChannel("LocalizationDownloader", "OnDownloadLocalizationComplete got called before www finished downloading."); + UnityDebugger.Debugger.LogError("LocalizationDownloader", "OnDownloadLocalizationComplete got called before www finished downloading."); www.Dispose(); return; } @@ -164,8 +164,8 @@ private static void OnDownloadLocalizationComplete(Action onLocalizationDownload if (string.IsNullOrEmpty(www.error) == false) { // This could be a thing when for example user has no internet connection. - Debug.ULogErrorChannel("LocalizationDownloader", "Error while downloading localizations files."); - Debug.ULogErrorChannel("LocalizationDownloader", www.error); + UnityDebugger.Debugger.LogError("LocalizationDownloader", "Error while downloading localizations files."); + UnityDebugger.Debugger.LogError("LocalizationDownloader", www.error); return; } @@ -232,14 +232,14 @@ private static void OnDownloadLocalizationComplete(Action onLocalizationDownload { if (file.Name != "en_US.lang" && file.Name != "en_US.lang.meta") { - Debug.ULogErrorChannel("LocalizationDownloader", "There should only be en_US.lang and en_US.lang.meta. Instead there is: " + file.Name); + UnityDebugger.Debugger.LogError("LocalizationDownloader", "There should only be en_US.lang and en_US.lang.meta. Instead there is: " + file.Name); } } DirectoryInfo[] dirInfo = localizationFolderInfo.GetDirectories(); if (dirInfo.Length > 1) { - Debug.ULogErrorChannel("LocalizationDownloader", "There should be only one directory"); + UnityDebugger.Debugger.LogError("LocalizationDownloader", "There should be only one directory"); } // Move files from ProjectPorcupineLocalization-*branch name* to Application.streamingAssetsPath/Localization. @@ -256,7 +256,7 @@ private static void OnDownloadLocalizationComplete(Action onLocalizationDownload // Remove ProjectPorcupineLocalization-*branch name* Directory.Delete(dirInfo[0].FullName); - Debug.ULogChannel("LocalizationDownloader", "New localization files successfully downloaded!"); + UnityDebugger.Debugger.Log("LocalizationDownloader", "New localization files successfully downloaded!"); onLocalizationDownloadedCallback(); } @@ -271,7 +271,7 @@ private static DirectoryInfo ClearLocalizationDirectory() // b) We are in a wrong directory, so let's hope we didn't delete anything important. if (file.Extension != ".lang" && file.Extension != ".meta" && file.Extension != ".ver" && file.Extension != ".md" && file.Name != "config.xml") { - Debug.ULogErrorChannel("LocalizationDownloader", "SOMETHING WENT HORRIBLY WRONG AT DOWNLOADING LOCALIZATION!"); + UnityDebugger.Debugger.LogError("LocalizationDownloader", "SOMETHING WENT HORRIBLY WRONG AT DOWNLOADING LOCALIZATION!"); throw new Exception("SOMETHING WENT HORRIBLY WRONG AT DOWNLOADING LOCALIZATION!"); } @@ -317,12 +317,12 @@ private static string GetLocalizationVersionFromConfig() catch (FileNotFoundException) { // It's fine - we will create that file later. - Debug.ULogChannel("LocalizationDownloader", localizationConfigFilePath + " file not found, forcing an update."); + UnityDebugger.Debugger.Log("LocalizationDownloader", localizationConfigFilePath + " file not found, forcing an update."); } catch (DirectoryNotFoundException) { // This is probably first launch of the game. - Debug.ULogChannel("LocalizationDownloader", LocalizationFolderPath + " folder not found, creating..."); + UnityDebugger.Debugger.Log("LocalizationDownloader", LocalizationFolderPath + " folder not found, creating..."); try { diff --git a/Assets/Scripts/Localization/LocalizationLoader.cs b/Assets/Scripts/Localization/LocalizationLoader.cs index 532ed5432..f6367db66 100644 --- a/Assets/Scripts/Localization/LocalizationLoader.cs +++ b/Assets/Scripts/Localization/LocalizationLoader.cs @@ -69,7 +69,7 @@ private void LoadLocalizationInDirectory(string path) LocalizationTable.LoadLocalizationFile(file); // Just write a little debug info into the console. - Debug.ULogChannel("LocalizationLoader", "Loaded localization at path: " + file); + UnityDebugger.Debugger.Log("LocalizationLoader", "Loaded localization at path: " + file); } } diff --git a/Assets/Scripts/Localization/LocalizationTable.cs b/Assets/Scripts/Localization/LocalizationTable.cs index 1abe06d93..7bf3358e1 100644 --- a/Assets/Scripts/Localization/LocalizationTable.cs +++ b/Assets/Scripts/Localization/LocalizationTable.cs @@ -85,7 +85,7 @@ public static string GetLocalization(string key, FallbackMode fallbackMode, stri if (!missingKeysLogged.Contains(key)) { missingKeysLogged.Add(key); - Debug.ULogChannel("LocalizationTable", string.Format("Translation for {0} in {1} language failed: Key not in dictionary.", key, language)); + UnityDebugger.Debugger.Log("LocalizationTable", string.Format("Translation for {0} in {1} language failed: Key not in dictionary.", key, language)); } switch (fallbackMode) @@ -103,7 +103,7 @@ public static string GetLocalizaitonCodeLocalization(string code) { if (localizationConfigurations.ContainsKey(code) == false) { - Debug.ULogChannel("LocalizationTable", "name of " + code + " is not present in config.xml"); + UnityDebugger.Debugger.Log("LocalizationTable", "name of " + code + " is not present in config.xml"); return code; } @@ -144,7 +144,7 @@ public static void LoadConfigFile(string pathToConfigFile) if (File.Exists(pathToConfigFile) == false) { - Debug.ULogErrorChannel("LocalizationTable", "No config file found at: " + pathToConfigFile); + UnityDebugger.Debugger.LogError("LocalizationTable", "No config file found at: " + pathToConfigFile); configExists = false; return; } @@ -205,7 +205,7 @@ public static string ReverseString(string original) // For now lets assume that passing in { or } without a number in between is likely an error // why would a string need curly brackets in game? // Note: this removes the curly braces and cannot replace them since string.split doesn't say whether { or } appeared - Debug.ULogWarningChannel("LocalizationTable", "{ or } exist in localization string '" + original + "' for " + currentLanguage + "but do not enclose a number for string substitution."); + UnityDebugger.Debugger.LogWarning("LocalizationTable", "{ or } exist in localization string '" + original + "' for " + currentLanguage + "but do not enclose a number for string substitution."); } } @@ -237,7 +237,7 @@ private static void LoadLocalizationFile(string path, string localizationCode) if (configExists && localizationConfigurations.ContainsKey(localizationCode) == false) { - Debug.ULogErrorChannel("LocalizationTable", "Language: " + localizationCode + " not defined in localization/config.xml"); + UnityDebugger.Debugger.LogError("LocalizationTable", "Language: " + localizationCode + " not defined in localization/config.xml"); } // Only the current and default languages translations will be loaded in memory. @@ -246,7 +246,7 @@ private static void LoadLocalizationFile(string path, string localizationCode) bool rightToLeftLanguage; if (localizationConfigurations.ContainsKey(localizationCode) == false) { - Debug.ULogWarningChannel("LocalizationTable", "Assuming " + localizationCode + " is LTR"); + UnityDebugger.Debugger.LogWarning("LocalizationTable", "Assuming " + localizationCode + " is LTR"); rightToLeftLanguage = false; } else @@ -262,7 +262,7 @@ private static void LoadLocalizationFile(string path, string localizationCode) if (keyValuePair.Length != 2) { - Debug.ULogErrorChannel("LocalizationTable", string.Format("Invalid format of localization string. Actual {0}", line)); + UnityDebugger.Debugger.LogError("LocalizationTable", string.Format("Invalid format of localization string. Actual {0}", line)); continue; } @@ -278,7 +278,7 @@ private static void LoadLocalizationFile(string path, string localizationCode) } catch (FileNotFoundException exception) { - Debug.ULogErrorChannel("LocalizationTable", new Exception(string.Format("There is no localization file for {0}", localizationCode), exception).ToString()); + UnityDebugger.Debugger.LogError("LocalizationTable", new Exception(string.Format("There is no localization file for {0}", localizationCode), exception).ToString()); } } } diff --git a/Assets/Scripts/Models/Animation/SpritenameAnimation.cs b/Assets/Scripts/Models/Animation/SpritenameAnimation.cs index 3b6a7803a..50b11bca4 100644 --- a/Assets/Scripts/Models/Animation/SpritenameAnimation.cs +++ b/Assets/Scripts/Models/Animation/SpritenameAnimation.cs @@ -67,7 +67,7 @@ public void SetFrame(int frame) { if (frame >= frameCount) { - Debug.ULogErrorChannel("Animation", "SetFrame frame " + frame + " int is larger than array length " + frameCount + "."); + UnityDebugger.Debugger.LogError("Animation", "SetFrame frame " + frame + " int is larger than array length " + frameCount + "."); return; } diff --git a/Assets/Scripts/Models/Area/Room.cs b/Assets/Scripts/Models/Area/Room.cs index 2486aa3be..bbffbae57 100644 --- a/Assets/Scripts/Models/Area/Room.cs +++ b/Assets/Scripts/Models/Area/Room.cs @@ -398,7 +398,7 @@ public bool DesignateRoomBehavior(RoomBehavior objInstance) if (objInstance.IsValidRoom(this) == false) { - Debug.ULogErrorChannel("Tile", "Trying to assign a RoomBehavior to a room that isn't valid!"); + UnityDebugger.Debugger.LogError("Tile", "Trying to assign a RoomBehavior to a room that isn't valid!"); return false; } diff --git a/Assets/Scripts/Models/Area/RoomManager.cs b/Assets/Scripts/Models/Area/RoomManager.cs index 3d1024482..ec43dd0fe 100644 --- a/Assets/Scripts/Models/Area/RoomManager.cs +++ b/Assets/Scripts/Models/Area/RoomManager.cs @@ -252,7 +252,7 @@ public void DoRoomFloodFill(Tile sourceTile, bool splitting, bool floodFillingOn // to remove the room from the world's list. if (oldRoom.TileCount > 0) { - Debug.ULogErrorChannel("Room", "'oldRoom' still has tiles assigned to it. This is clearly wrong."); + UnityDebugger.Debugger.LogError("Room", "'oldRoom' still has tiles assigned to it. This is clearly wrong."); } Remove(oldRoom); @@ -346,7 +346,7 @@ public void DoRoomFloodFill(Tile sourceTile, bool splitting, bool floodFillingOn // to remove the room from the world's list. if (oldRoom.TileCount > 0) { - Debug.ULogErrorChannel("Room", "'oldRoom' still has tiles assigned to it. This is clearly wrong."); + UnityDebugger.Debugger.LogError("Room", "'oldRoom' still has tiles assigned to it. This is clearly wrong."); } Remove(oldRoom); diff --git a/Assets/Scripts/Models/Area/Temperature.cs b/Assets/Scripts/Models/Area/Temperature.cs index be9c84f5c..fe8635335 100644 --- a/Assets/Scripts/Models/Area/Temperature.cs +++ b/Assets/Scripts/Models/Area/Temperature.cs @@ -218,7 +218,7 @@ public bool IsWithinTemperatureBounds(float temp) else { // string.format not needed with UberLogger. - Debug.ULogWarningChannel("Temperature", "Yep, something is wrong with your temperature: {0}.", temp); + UnityDebugger.Debugger.LogWarningFormat("Temperature", "Yep, something is wrong with your temperature: {0}.", temp); return false; } } @@ -236,7 +236,7 @@ public bool IsWithinThermalDiffusivityBounds(float thermal_diff) } else { - Debug.ULogWarningChannel("Temperature", "Trying to set a thermal diffusivity that may break the world: {0}.", thermal_diff); + UnityDebugger.Debugger.LogWarningFormat("Temperature", "Trying to set a thermal diffusivity that may break the world: {0}.", thermal_diff); return false; } } diff --git a/Assets/Scripts/Models/Area/World.cs b/Assets/Scripts/Models/Area/World.cs index 0c1ba9984..4274f5867 100644 --- a/Assets/Scripts/Models/Area/World.cs +++ b/Assets/Scripts/Models/Area/World.cs @@ -53,7 +53,7 @@ public World(int width, int height, int depth) int seed = UnityEngine.Random.Range(0, int.MaxValue); Debug.LogWarning("World Seed: " + seed); WorldGenerator.Instance.Generate(this, seed); - Debug.ULogChannel("World", "Generated World"); + UnityDebugger.Debugger.Log("World", "Generated World"); tileGraph = new Path_TileGraph(this); @@ -422,7 +422,7 @@ private void LoadSkybox(string name = null) } else { - Debug.ULogWarningChannel("World", "No skyboxes detected! Falling back to black."); + UnityDebugger.Debugger.LogWarning("World", "No skyboxes detected! Falling back to black."); } } @@ -509,7 +509,7 @@ private void TestRoomGraphGeneration(World world) if (roomGraph.nodes.Count() != 8) { - Debug.ULogErrorChannel("Path_RoomGraph", "Generated incorrect number of nodes: " + roomGraph.nodes.Count().ToString()); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Generated incorrect number of nodes: " + roomGraph.nodes.Count().ToString()); errorCount++; } @@ -517,7 +517,7 @@ private void TestRoomGraphGeneration(World world) { if (roomGraph.nodes.ContainsKey(r) == false) { - Debug.ULogErrorChannel("Path_RoomGraph", "Does not contain room: " + r.ID); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Does not contain room: " + r.ID); errorCount++; } else @@ -529,15 +529,15 @@ private void TestRoomGraphGeneration(World world) case 0: // the outside room has two edges both connecting to room 2 if (edgeCount != 2) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 0 supposed to have 2 edges. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 0 supposed to have 2 edges. Instead has: " + edgeCount); errorCount++; continue; } if (node.edges[0].node.data != world.RoomManager[2] || node.edges[1].node.data != world.RoomManager[4]) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 0 supposed to have edges to Room 2 and Room 4."); - Debug.ULogErrorChannel( + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 0 supposed to have edges to Room 2 and Room 4."); + UnityDebugger.Debugger.LogError( "Path_RoomGraph", string.Format("Instead has: {1} and {2}", node.edges[0].node.data.ID, node.edges[1].node.data.ID)); errorCount++; @@ -547,15 +547,15 @@ private void TestRoomGraphGeneration(World world) case 1: // Room 1 has one edge connecting to room 2 if (edgeCount != 1) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 1 supposed to have 1 edge. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 1 supposed to have 1 edge. Instead has: " + edgeCount); errorCount++; continue; } if (node.edges[0].node.data != world.RoomManager[3]) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 1 supposed to have edge to Room 3."); - Debug.ULogErrorChannel("Path_RoomGraph", "Instead has: " + node.edges[0].node.data.ID.ToString()); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 1 supposed to have edge to Room 3."); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Instead has: " + node.edges[0].node.data.ID.ToString()); errorCount++; } @@ -563,15 +563,15 @@ private void TestRoomGraphGeneration(World world) case 2: // Room 2 has two edges both connecting to the outside room, one connecting to room 1 and one connecting to room 5 if (edgeCount != 2) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 2 supposed to have 2 edges. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 2 supposed to have 2 edges. Instead has: " + edgeCount); errorCount++; continue; } if (node.edges[0].node.data != world.RoomManager[3] || node.edges[1].node.data != world.RoomManager[0]) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 2 supposed to have edges to Room 3 and Room 0."); - Debug.ULogErrorChannel( + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 2 supposed to have edges to Room 3 and Room 0."); + UnityDebugger.Debugger.LogError( "Path_RoomGraph", string.Format("Instead has: {0} and {1}", node.edges[0].node.data.ID, node.edges[1].node.data.ID)); errorCount++; @@ -581,7 +581,7 @@ private void TestRoomGraphGeneration(World world) case 3: // Room 3 has 4 edges, connecting to Rooms 1, 2, 4, and 7 if (edgeCount != 4) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 3 supposed to have 4 edges. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 3 supposed to have 4 edges. Instead has: " + edgeCount); errorCount++; continue; } @@ -589,14 +589,14 @@ private void TestRoomGraphGeneration(World world) if (node.edges[0].node.data != world.RoomManager[4] || node.edges[1].node.data != world.RoomManager[7] || node.edges[2].node.data != world.RoomManager[1] || node.edges[3].node.data != world.RoomManager[2]) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 3 supposed to have edges to Rooms 4, 7, 1, and 2"); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 3 supposed to have edges to Rooms 4, 7, 1, and 2"); string errorMessage = string.Format( "Instead has: {0}, {1}, {2}, and {3}", node.edges[0].node.data.ID, node.edges[1].node.data.ID, node.edges[2].node.data.ID, node.edges[3].node.data.ID); - Debug.ULogErrorChannel("Path_RoomGraph", errorMessage); + UnityDebugger.Debugger.LogError("Path_RoomGraph", errorMessage); errorCount++; } @@ -604,15 +604,15 @@ private void TestRoomGraphGeneration(World world) case 4: // Room 2 has two edges both connecting to the outside room, one connecting to room 1 and one connecting to room 5 if (edgeCount != 2) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 4 supposed to have 2 edges. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 4 supposed to have 2 edges. Instead has: " + edgeCount); errorCount++; continue; } if (node.edges[0].node.data != world.RoomManager[0] || node.edges[1].node.data != world.RoomManager[3]) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 4 supposed to have edges to Room 0 and Room 3."); - Debug.ULogErrorChannel( + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 4 supposed to have edges to Room 0 and Room 3."); + UnityDebugger.Debugger.LogError( "Path_RoomGraph", string.Format("Instead has: {0} and {1}", node.edges[0].node.data.ID, node.edges[1].node.data.ID)); @@ -625,7 +625,7 @@ private void TestRoomGraphGeneration(World world) case 5: // Room 5 has no edges if (edgeCount != 0) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 5 supposed to have no edges. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 5 supposed to have no edges. Instead has: " + edgeCount); errorCount++; continue; } @@ -634,7 +634,7 @@ private void TestRoomGraphGeneration(World world) case 6: // Room 4 has no edges if (edgeCount != 0) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 6 supposed to have no edges. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 6 supposed to have no edges. Instead has: " + edgeCount); errorCount++; continue; } @@ -643,21 +643,21 @@ private void TestRoomGraphGeneration(World world) case 7: // Room 5 has one edge to Room 3 if (edgeCount != 1) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 7 supposed to have 1 edge. Instead has: " + edgeCount); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 7 supposed to have 1 edge. Instead has: " + edgeCount); errorCount++; continue; } if (node.edges[0].node.data != world.RoomManager[3]) { - Debug.ULogErrorChannel("Path_RoomGraph", "Room 7 supposed to have edge to Room 3."); - Debug.ULogErrorChannel("Path_RoomGraph", "Instead has: " + node.edges[0].node.data.ID.ToString()); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Room 7 supposed to have edge to Room 3."); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Instead has: " + node.edges[0].node.data.ID.ToString()); errorCount++; } break; default: - Debug.ULogErrorChannel("Path_RoomGraph", "Unknown room ID: " + r.ID); + UnityDebugger.Debugger.LogError("Path_RoomGraph", "Unknown room ID: " + r.ID); errorCount++; break; } @@ -666,7 +666,7 @@ private void TestRoomGraphGeneration(World world) if (errorCount == 0) { - Debug.ULogChannel("Path_RoomGraph", "TestRoomGraphGeneration completed without errors!"); + UnityDebugger.Debugger.Log("Path_RoomGraph", "TestRoomGraphGeneration completed without errors!"); } } diff --git a/Assets/Scripts/Models/Area/WorldGenerator.cs b/Assets/Scripts/Models/Area/WorldGenerator.cs index 374ef1d62..36c8e70d5 100644 --- a/Assets/Scripts/Models/Area/WorldGenerator.cs +++ b/Assets/Scripts/Models/Area/WorldGenerator.cs @@ -192,7 +192,7 @@ private void ReadXML() } else { - Debug.ULogErrorChannel("WorldGenerator", "Did not find a 'Asteroid' element in the WorldGenerator definition file."); + UnityDebugger.Debugger.LogError("WorldGenerator", "Did not find a 'Asteroid' element in the WorldGenerator definition file."); } if (reader.ReadToNextSibling("StartArea")) @@ -208,7 +208,7 @@ private void ReadXML() } else { - Debug.ULogErrorChannel("WorldGenerator", "Did not find a 'StartArea' element in the WorldGenerator definition file."); + UnityDebugger.Debugger.LogError("WorldGenerator", "Did not find a 'StartArea' element in the WorldGenerator definition file."); } if (reader.ReadToNextSibling("Wallet")) @@ -224,12 +224,12 @@ private void ReadXML() } else { - Debug.ULogErrorChannel("WorldGenerator", "Did not find a 'Wallet' element in the WorldGenerator definition file."); + UnityDebugger.Debugger.LogError("WorldGenerator", "Did not find a 'Wallet' element in the WorldGenerator definition file."); } } else { - Debug.ULogErrorChannel("WorldGenerator", "Did not find a 'WorldGenerator' element in the WorldGenerator definition file."); + UnityDebugger.Debugger.LogError("WorldGenerator", "Did not find a 'WorldGenerator' element in the WorldGenerator definition file."); } } @@ -261,7 +261,7 @@ private void ReadXmlStartArea(XmlReader reader) if (splittedString.Length < startAreaWidth * startAreaHeight) { - Debug.ULogErrorChannel("WorldGenerator", "Error reading 'Tiles' array to short: " + splittedString.Length + " !"); + UnityDebugger.Debugger.LogError("WorldGenerator", "Error reading 'Tiles' array to short: " + splittedString.Length + " !"); break; } diff --git a/Assets/Scripts/Models/Buildable/Components/BuildableComponent.cs b/Assets/Scripts/Models/Buildable/Components/BuildableComponent.cs index 731e697d7..c61471afd 100644 --- a/Assets/Scripts/Models/Buildable/Components/BuildableComponent.cs +++ b/Assets/Scripts/Models/Buildable/Components/BuildableComponent.cs @@ -96,7 +96,7 @@ public static BuildableComponent Deserialize(XmlReader xmlReader) } else { - Debug.ULogErrorChannel(ComponentLogChannel, "There is no deserializer for component '{0}'", componentTypeName); + UnityDebugger.Debugger.LogErrorFormat(ComponentLogChannel, "There is no deserializer for component '{0}'", componentTypeName); return null; } } @@ -120,7 +120,7 @@ public static BuildableComponent Deserialize(JToken jtoken) } else { - Debug.ULogErrorChannel(ComponentLogChannel, "There is no deserializer for component '{0}'", componentTypeName); + UnityDebugger.Debugger.LogErrorFormat(ComponentLogChannel, "There is no deserializer for component '{0}'", componentTypeName); return null; } } @@ -236,7 +236,7 @@ protected bool AreParameterConditionsFulfilled(List conditio foreach (BuildableComponentNameAttribute compNameAttr in attribs) { componentTypes.Add(compNameAttr.ComponentName, type); - Debug.ULogChannel(ComponentLogChannel, "Found component in assembly: {0}", compNameAttr.ComponentName); + UnityDebugger.Debugger.LogFormat(ComponentLogChannel, "Found component in assembly: {0}", compNameAttr.ComponentName); } } } diff --git a/Assets/Scripts/Models/Buildable/Components/Workshop.cs b/Assets/Scripts/Models/Buildable/Components/Workshop.cs index 0daabf251..fea6654a2 100644 --- a/Assets/Scripts/Models/Buildable/Components/Workshop.cs +++ b/Assets/Scripts/Models/Buildable/Components/Workshop.cs @@ -215,7 +215,7 @@ protected override void Initialize() } else { - Debug.ULogWarningChannel(ComponentLogChannel, "Furniture {0} is marked as factory, but has no production chain", ParentFurniture.Name); + UnityDebugger.Debugger.LogWarningFormat(ComponentLogChannel, "Furniture {0} is marked as factory, but has no production chain", ParentFurniture.Name); } } @@ -279,7 +279,7 @@ private void UnlockInventoryAtInput(Furniture furniture) if (tile.Inventory != null && tile.Inventory.Locked) { tile.Inventory.Locked = false; - Debug.ULogChannel(ComponentLogChannel, "Inventory {0} at tile {1} is unlocked", tile.Inventory, tile); + UnityDebugger.Debugger.LogFormat(ComponentLogChannel, "Inventory {0} at tile {1} is unlocked", tile.Inventory, tile); } } } diff --git a/Assets/Scripts/Models/Buildable/Furniture.cs b/Assets/Scripts/Models/Buildable/Furniture.cs index 350cf5bfb..fa5019a6e 100644 --- a/Assets/Scripts/Models/Buildable/Furniture.cs +++ b/Assets/Scripts/Models/Buildable/Furniture.cs @@ -402,7 +402,7 @@ public static Furniture PlaceInstance(Furniture proto, Tile tile) { if (proto.IsValidPosition(tile) == false) { - Debug.ULogWarningChannel("Furniture", "PlaceInstance :: Position Validity Function returned FALSE. " + proto.Name + " " + tile.X + ", " + tile.Y + ", " + tile.Z); + UnityDebugger.Debugger.LogWarning("Furniture", "PlaceInstance :: Position Validity Function returned FALSE. " + proto.Name + " " + tile.X + ", " + tile.Y + ", " + tile.Z); return null; } @@ -565,7 +565,7 @@ public void SetAnimationProgressValue(float currentValue, float maxValue) if (maxValue == 0) { - Debug.ULogError("SetAnimationProgressValue maxValue is zero"); + UnityDebugger.Debugger.LogError("SetAnimationProgressValue maxValue is zero"); } float percent = Mathf.Clamp01(currentValue / maxValue); @@ -893,7 +893,7 @@ public RequestedItem[] AcceptsForStorage() { if (HasTypeTag("Storage") == false) { - Debug.ULogChannel("Stockpile_messages", "Someone is asking a non-stockpile to store stuff!?"); + UnityDebugger.Debugger.Log("Stockpile_messages", "Someone is asking a non-stockpile to store stuff!?"); return null; } diff --git a/Assets/Scripts/Models/Buildable/FurnitureManager.cs b/Assets/Scripts/Models/Buildable/FurnitureManager.cs index f8f221e20..0f82d6441 100644 --- a/Assets/Scripts/Models/Buildable/FurnitureManager.cs +++ b/Assets/Scripts/Models/Buildable/FurnitureManager.cs @@ -52,7 +52,7 @@ public Furniture PlaceFurniture(string type, Tile tile, bool doRoomFloodFill = t { if (PrototypeManager.Furniture.Has(type) == false) { - Debug.ULogErrorChannel("World", "furniturePrototypes doesn't contain a proto for key: " + type); + UnityDebugger.Debugger.LogError("World", "furniturePrototypes doesn't contain a proto for key: " + type); return null; } diff --git a/Assets/Scripts/Models/Buildable/Tile.cs b/Assets/Scripts/Models/Buildable/Tile.cs index 83d0858de..c6cfba0a8 100644 --- a/Assets/Scripts/Models/Buildable/Tile.cs +++ b/Assets/Scripts/Models/Buildable/Tile.cs @@ -202,7 +202,7 @@ public bool PlaceFurniture(Furniture objInstance) if (objInstance.IsValidPosition(this) == false) { - Debug.ULogErrorChannel("Tile", "Trying to assign a furniture to a tile that isn't valid!"); + UnityDebugger.Debugger.LogError("Tile", "Trying to assign a furniture to a tile that isn't valid!"); return false; } @@ -223,7 +223,7 @@ public bool UnplaceUtility(Utility utility) // Just uninstalling. if (Utilities == null) { - Debug.ULogErrorChannel("Tile", "Utilities null when trying to unplace a Utility, this should never happen!"); + UnityDebugger.Debugger.LogError("Tile", "Utilities null when trying to unplace a Utility, this should never happen!"); return false; } @@ -241,7 +241,7 @@ public bool PlaceUtility(Utility objInstance) if (objInstance.IsValidPosition(this) == false) { - Debug.ULogErrorChannel("Tile", "Trying to assign a furniture to a tile that isn't valid!"); + UnityDebugger.Debugger.LogError("Tile", "Trying to assign a furniture to a tile that isn't valid!"); return false; } @@ -263,7 +263,7 @@ public bool PlaceInventory(Inventory inventory) // There's already inventory here. Maybe we can combine a stack? if (Inventory.Type != inventory.Type) { - Debug.ULogErrorChannel("Tile", "Trying to assign inventory to a tile that already has some of a different type."); + UnityDebugger.Debugger.LogError("Tile", "Trying to assign inventory to a tile that already has some of a different type."); return false; } diff --git a/Assets/Scripts/Models/Buildable/TileType.cs b/Assets/Scripts/Models/Buildable/TileType.cs index 7adb356d8..eef47961c 100644 --- a/Assets/Scripts/Models/Buildable/TileType.cs +++ b/Assets/Scripts/Models/Buildable/TileType.cs @@ -163,7 +163,7 @@ public bool CanBuildHere(Tile tile) return value.Boolean; } - Debug.ULogChannel("Lua", "Found no lua function " + CanBuildHereLua); + UnityDebugger.Debugger.Log("Lua", "Found no lua function " + CanBuildHereLua); return false; } @@ -232,7 +232,7 @@ private void ReadBuildingJob(XmlReader parentReader) float jobTimeValue; if (float.TryParse(jobTime, out jobTimeValue) == false) { - Debug.ULogErrorChannel(ULogChanelName, "Could not load jobTime for TyleType: {0} -- jobTime readed {1}", Type, jobTime); + UnityDebugger.Debugger.LogErrorFormat(ULogChanelName, "Could not load jobTime for TyleType: {0} -- jobTime readed {1}", Type, jobTime); return; } @@ -255,7 +255,7 @@ private void ReadBuildingJob(XmlReader parentReader) } else { - Debug.ULogErrorChannel(ULogChanelName, "Could not load Inventory item for TyleType: {0}", Type); + UnityDebugger.Debugger.LogErrorFormat(ULogChanelName, "Could not load Inventory item for TyleType: {0}", Type); } } diff --git a/Assets/Scripts/Models/Buildable/Utility.cs b/Assets/Scripts/Models/Buildable/Utility.cs index 6ea3285e5..b15e59164 100644 --- a/Assets/Scripts/Models/Buildable/Utility.cs +++ b/Assets/Scripts/Models/Buildable/Utility.cs @@ -236,7 +236,7 @@ public static Utility PlaceInstance(Utility proto, Tile tile, bool skipGridUpdat { if (proto.IsValidPosition(tile) == false) { - Debug.ULogErrorChannel("Utility", "PlaceInstance -- Position Validity Function returned FALSE. " + proto.Name + " " + tile.X + ", " + tile.Y + ", " + tile.Z); + UnityDebugger.Debugger.LogError("Utility", "PlaceInstance -- Position Validity Function returned FALSE. " + proto.Name + " " + tile.X + ", " + tile.Y + ", " + tile.Z); return null; } diff --git a/Assets/Scripts/Models/Buildable/UtilityManager.cs b/Assets/Scripts/Models/Buildable/UtilityManager.cs index b16d3a839..7b0a84d0f 100644 --- a/Assets/Scripts/Models/Buildable/UtilityManager.cs +++ b/Assets/Scripts/Models/Buildable/UtilityManager.cs @@ -39,7 +39,7 @@ public Utility PlaceUtility(string type, Tile tile, bool skipGridUpdate = false) { if (PrototypeManager.Utility.Has(type) == false) { - Debug.ULogErrorChannel("World", "PrototypeManager.Utility doesn't contain a proto for key: " + type); + UnityDebugger.Debugger.LogError("World", "PrototypeManager.Utility doesn't contain a proto for key: " + type); return null; } diff --git a/Assets/Scripts/Models/Character/Character.cs b/Assets/Scripts/Models/Character/Character.cs index b816ac22f..6840a28a6 100644 --- a/Assets/Scripts/Models/Character/Character.cs +++ b/Assets/Scripts/Models/Character/Character.cs @@ -240,7 +240,7 @@ public IEnumerable GetContextMenuActions(ContextMenu contextM { LocalizationKey = "Poke " + GetName(), RequireCharacterSelected = false, - Action = (cm, c) => { Debug.ULogChannel("Character", GetDescription()); health.CurrentHealth -= 5; } + Action = (cm, c) => { UnityDebugger.Debugger.Log("Character", GetDescription()); health.CurrentHealth -= 5; } }; yield return new ContextMenuAction @@ -499,7 +499,7 @@ public void ReadStatsFromSave(XmlReader reader) int statValue; if (!int.TryParse(reader.GetAttribute("value"), out statValue)) { - Debug.ULogErrorChannel("Character", "Stat element did not have a value!"); + UnityDebugger.Debugger.LogError("Character", "Stat element did not have a value!"); continue; } @@ -556,7 +556,7 @@ private void LoadStats() stats.Add(newStat.Type, newStat); } - Debug.ULogChannel("Character", "Initialized " + stats.Count + " Stats."); + UnityDebugger.Debugger.Log("Character", "Initialized " + stats.Count + " Stats."); } /// diff --git a/Assets/Scripts/Models/DialogBoxInformation/DialogButton.cs b/Assets/Scripts/Models/DialogBoxInformation/DialogButton.cs index 3b69ad73b..e44592251 100644 --- a/Assets/Scripts/Models/DialogBoxInformation/DialogButton.cs +++ b/Assets/Scripts/Models/DialogBoxInformation/DialogButton.cs @@ -18,11 +18,11 @@ public void OnClicked() buttonName = buttonName.Replace(" ", "_"); EventActions dialogEvents = transform.GetComponentInParent().events; - Debug.ULogChannel("ModDialogBox", "Calling On" + buttonName + "Clicked function"); + UnityDebugger.Debugger.Log("ModDialogBox", "Calling On" + buttonName + "Clicked function"); if (dialogEvents.HasEvent("On" + buttonName + "Clicked") == true) { - Debug.ULogChannel("ModDialogBox", "Found On" + buttonName + "Clicked event"); + UnityDebugger.Debugger.Log("ModDialogBox", "Found On" + buttonName + "Clicked event"); dialogEvents.Trigger("On" + buttonName + "Clicked", transform.GetComponentInParent()); } } diff --git a/Assets/Scripts/Models/Events/AutosaveManager.cs b/Assets/Scripts/Models/Events/AutosaveManager.cs index 2b29fcd35..a6f1a16f5 100644 --- a/Assets/Scripts/Models/Events/AutosaveManager.cs +++ b/Assets/Scripts/Models/Events/AutosaveManager.cs @@ -108,10 +108,10 @@ public void DoAutosave(ScheduledEvent evt) } string filePath = Path.Combine(saveDir.ToString(), fileName + ".sav"); - Debug.ULogChannel("AutosaveManager", "Autosaving to '{0}'.", filePath); + UnityDebugger.Debugger.LogFormat("AutosaveManager", "Autosaving to '{0}'.", filePath); if (File.Exists(filePath) == true) { - Debug.ULogErrorChannel("AutosaveManager", "File already exists -- overwriting the file for now."); + UnityDebugger.Debugger.LogError("AutosaveManager", "File already exists -- overwriting the file for now."); } WorldController.Instance.SaveWorld(filePath); diff --git a/Assets/Scripts/Models/Events/EventAction.cs b/Assets/Scripts/Models/Events/EventAction.cs index 3470837f5..d2310e1f2 100644 --- a/Assets/Scripts/Models/Events/EventAction.cs +++ b/Assets/Scripts/Models/Events/EventAction.cs @@ -44,19 +44,19 @@ public void ReadXml(XmlReader reader) reader.Read(); if (reader.Name != "Action") { - Debug.ULogErrorChannel("EventActions", string.Format("The element is not an Action, but a \"{0}\"", reader.Name)); + UnityDebugger.Debugger.LogError("EventActions", string.Format("The element is not an Action, but a \"{0}\"", reader.Name)); } string name = reader.GetAttribute("event"); if (name == null) { - Debug.ULogErrorChannel("EventActions", string.Format("The attribute \"event\" is a mandatory for an \"Action\" element.")); + UnityDebugger.Debugger.LogError("EventActions", string.Format("The attribute \"event\" is a mandatory for an \"Action\" element.")); } string functionName = reader.GetAttribute("functionName"); if (functionName == null) { - Debug.ULogErrorChannel("EventActions", string.Format("No function name was provided for the Action {0}.", name)); + UnityDebugger.Debugger.LogError("EventActions", string.Format("No function name was provided for the Action {0}.", name)); } Register(name, functionName); diff --git a/Assets/Scripts/Models/Events/TimeManager.cs b/Assets/Scripts/Models/Events/TimeManager.cs index 67a207aeb..82f8a75b1 100644 --- a/Assets/Scripts/Models/Events/TimeManager.cs +++ b/Assets/Scripts/Models/Events/TimeManager.cs @@ -158,7 +158,7 @@ public void SetTimeScalePosition(int newTimeScalePosition) { timeScalePosition = newTimeScalePosition; TimeScale = possibleTimeScales[newTimeScalePosition]; - Debug.ULogChannel("Game speed", "Game speed set to " + TimeScale + "x"); + UnityDebugger.Debugger.Log("Game speed", "Game speed set to " + TimeScale + "x"); } } diff --git a/Assets/Scripts/Models/Functions/CSharpFunctions.cs b/Assets/Scripts/Models/Functions/CSharpFunctions.cs index 1f6efaed2..39ac4ede4 100644 --- a/Assets/Scripts/Models/Functions/CSharpFunctions.cs +++ b/Assets/Scripts/Models/Functions/CSharpFunctions.cs @@ -83,7 +83,7 @@ public bool LoadScript(string text, string scriptName) { if (CompilationResult.HasErrors) { - Debug.ULogErrorChannel( + UnityDebugger.Debugger.LogError( "CSharp", string.Format("[{0}] CSharp compile errors ({1}): {2}", scriptName, CompilationResult.Errors.Count, CompilationResult.GetErrorsLog())); } @@ -123,7 +123,7 @@ public void CallWithInstance(string[] functionNames, object instance, params obj { if (fn == null) { - Debug.ULogErrorChannel("CSharp", "'" + fn + "' is not a CSharp function."); + UnityDebugger.Debugger.LogError("CSharp", "'" + fn + "' is not a CSharp function."); return; } @@ -136,7 +136,7 @@ public void CallWithInstance(string[] functionNames, object instance, params obj if (result != null && result.Type == DataType.String) { - Debug.ULogErrorChannel("CSharp", result.String); + UnityDebugger.Debugger.LogError("CSharp", result.String); } } } diff --git a/Assets/Scripts/Models/Functions/Functions.cs b/Assets/Scripts/Models/Functions/Functions.cs index e6831e5b3..ca70aae5a 100644 --- a/Assets/Scripts/Models/Functions/Functions.cs +++ b/Assets/Scripts/Models/Functions/Functions.cs @@ -81,8 +81,7 @@ public T Call(string functionName, params object[] args) } else { - Debug.ULogChannel(ModFunctionsLogChannel, "'" + functionName + "' is not a LUA nor CSharp function!"); - + UnityDebugger.Debugger.Log(ModFunctionsLogChannel, "'" + functionName + "' is not a LUA nor CSharp function!"); return default(T); } } @@ -93,7 +92,7 @@ public void CallWithInstance(string[] functionNames, object instance, params obj { if (fn == null) { - Debug.ULogErrorChannel(ModFunctionsLogChannel, "'" + fn + "' is not a LUA nor CSharp function!"); + UnityDebugger.Debugger.LogError(ModFunctionsLogChannel, "'" + fn + "' is not a LUA nor CSharp function!"); return; } @@ -106,7 +105,7 @@ public void CallWithInstance(string[] functionNames, object instance, params obj if (result != null && result.Type == DataType.String) { - Debug.ULogErrorChannel(ModFunctionsLogChannel, result.String); + UnityDebugger.Debugger.LogError(ModFunctionsLogChannel, result.String); } } } @@ -128,7 +127,7 @@ private DynValue Call(string functionName, bool throwError, params object[] args } else { - Debug.ULogChannel(ModFunctionsLogChannel, "'" + functionName + "' is not a LUA nor is it a CSharp function!"); + UnityDebugger.Debugger.Log(ModFunctionsLogChannel, "'" + functionName + "' is not a LUA nor is it a CSharp function!"); if (throwError) { diff --git a/Assets/Scripts/Models/Functions/LuaFunctions.cs b/Assets/Scripts/Models/Functions/LuaFunctions.cs index 3cfd70521..f8bfb7dea 100644 --- a/Assets/Scripts/Models/Functions/LuaFunctions.cs +++ b/Assets/Scripts/Models/Functions/LuaFunctions.cs @@ -64,7 +64,7 @@ public bool LoadScript(string text, string scriptName) } catch (SyntaxErrorException e) { - Debug.ULogErrorChannel("Lua", "[" + scriptName + "] LUA Parse error: " + e.DecoratedMessage); + UnityDebugger.Debugger.LogError("Lua", "[" + scriptName + "] LUA Parse error: " + e.DecoratedMessage); return false; } @@ -97,14 +97,14 @@ public void CallWithInstance(string[] functionNames, object instance, params obj if (instance == null) { // These errors are about the lua code so putting them in the Lua channel. - Debug.ULogErrorChannel("Lua", "Instance is null, cannot call LUA function (something is fishy)."); + UnityDebugger.Debugger.LogError("Lua", "Instance is null, cannot call LUA function (something is fishy)."); } foreach (string fn in functionNames) { if (fn == null) { - Debug.ULogErrorChannel("Lua", "'" + fn + "' is not a LUA function."); + UnityDebugger.Debugger.LogError("Lua", "'" + fn + "' is not a LUA function."); return; } @@ -118,7 +118,7 @@ public void CallWithInstance(string[] functionNames, object instance, params obj } catch (ScriptRuntimeException e) { - Debug.ULogErrorChannel("Lua", "[" + scriptName + "] LUA RunTime error: " + e.DecoratedMessage); + UnityDebugger.Debugger.LogError("Lua", "[" + scriptName + "] LUA RunTime error: " + e.DecoratedMessage); } } } @@ -143,7 +143,7 @@ private DynValue Call(string functionName, bool throwError, params object[] args } catch (ScriptRuntimeException e) { - Debug.ULogErrorChannel("Lua", "[" + scriptName + "] LUA RunTime error: " + e.DecoratedMessage); + UnityDebugger.Debugger.LogError("Lua", "[" + scriptName + "] LUA RunTime error: " + e.DecoratedMessage); return null; } } diff --git a/Assets/Scripts/Models/InputOutput/AudioManager.cs b/Assets/Scripts/Models/InputOutput/AudioManager.cs index eb6e17b28..b305ac15b 100644 --- a/Assets/Scripts/Models/InputOutput/AudioManager.cs +++ b/Assets/Scripts/Models/InputOutput/AudioManager.cs @@ -91,7 +91,7 @@ public static SoundClip GetAudio(string categoryName, string audioName) { try { - Debug.LogWarning("No audio available called: " + audioNameAndCategory, null); + UnityDebugger.Debugger.LogWarning("No audio available called: " + audioNameAndCategory); clip = audioClips["Sound/Error"]; } catch diff --git a/Assets/Scripts/Models/InputOutput/SoundClip.cs b/Assets/Scripts/Models/InputOutput/SoundClip.cs index 55f9ee952..3a0795134 100644 --- a/Assets/Scripts/Models/InputOutput/SoundClip.cs +++ b/Assets/Scripts/Models/InputOutput/SoundClip.cs @@ -46,7 +46,7 @@ public Sound Get() { if (clips == null || clips.Count == 0) { - Debug.ULogErrorChannel("Audio", "Attempting to access an empty SoundClip."); + UnityDebugger.Debugger.LogError("Audio", "Attempting to access an empty SoundClip."); return null; } diff --git a/Assets/Scripts/Models/InputOutput/SpriteManager.cs b/Assets/Scripts/Models/InputOutput/SpriteManager.cs index b07822b29..48ed806d1 100644 --- a/Assets/Scripts/Models/InputOutput/SpriteManager.cs +++ b/Assets/Scripts/Models/InputOutput/SpriteManager.cs @@ -61,7 +61,7 @@ public static Sprite GetSprite(string categoryName, string spriteName) else { sprite = Sprite.Create(noResourceTexture, new Rect(Vector2.zero, new Vector3(32, 32)), new Vector2(0.5f, 0.5f), 32); - Debug.ULogWarning("No sprite: {0}, using fallback sprite.", spriteName); + UnityDebugger.Debugger.LogWarningFormat("SpriteManager", "No sprite: {0}, using fallback sprite.", spriteName); } return sprite; @@ -184,7 +184,7 @@ private static void LoadImage(string spriteCategory, string filePath) } else { - Debug.ULogErrorChannel("SpriteManager", "Could not find a tag."); + UnityDebugger.Debugger.LogError("SpriteManager", "Could not find a tag."); return; } } diff --git a/Assets/Scripts/Models/Inventory/Inventory.cs b/Assets/Scripts/Models/Inventory/Inventory.cs index 0ad54863b..122df2f33 100644 --- a/Assets/Scripts/Models/Inventory/Inventory.cs +++ b/Assets/Scripts/Models/Inventory/Inventory.cs @@ -145,7 +145,7 @@ public IEnumerable GetContextMenuActions(ContextMenu contextM { LocalizationKey = "Sample Item Context action", RequireCharacterSelected = true, - Action = (cm, c) => Debug.ULogChannel("Inventory", "Sample menu action") + Action = (cm, c) => UnityDebugger.Debugger.Log("Inventory", "Sample menu action") }; } diff --git a/Assets/Scripts/Models/Inventory/InventoryManager.cs b/Assets/Scripts/Models/Inventory/InventoryManager.cs index 7efa9f68a..eb8b6311d 100644 --- a/Assets/Scripts/Models/Inventory/InventoryManager.cs +++ b/Assets/Scripts/Models/Inventory/InventoryManager.cs @@ -149,7 +149,7 @@ public bool PlaceInventory(Job job, Character character) // Check that it's wanted by the job if (job.RequestedItems.ContainsKey(sourceInventory.Type) == false) { - Debug.ULogErrorChannel(InventoryManagerLogChanel, "Trying to add inventory to a job that it doesn't want."); + UnityDebugger.Debugger.LogError(InventoryManagerLogChanel, "Trying to add inventory to a job that it doesn't want."); return false; } @@ -187,7 +187,7 @@ public bool PlaceInventory(Character character, Inventory sourceInventory, int a } else if (character.inventory.Type != sourceInventory.Type) { - Debug.ULogErrorChannel(InventoryManagerLogChanel, "Character is trying to pick up a mismatched inventory object type."); + UnityDebugger.Debugger.LogError(InventoryManagerLogChanel, "Character is trying to pick up a mismatched inventory object type."); return false; } diff --git a/Assets/Scripts/Models/Job/Job.cs b/Assets/Scripts/Models/Job/Job.cs index 1c608c885..830ce896e 100644 --- a/Assets/Scripts/Models/Job/Job.cs +++ b/Assets/Scripts/Models/Job/Job.cs @@ -555,10 +555,10 @@ public void ReadXmlPrototype(XmlReader reader) public void FSMLogRequirements() { - Debug.ULogChannel("FSM", " - {0} {1}", Type, acceptsAny ? "Any" : "All"); + UnityDebugger.Debugger.Log("FSM", string.Format(" - {0} {1}", Type, acceptsAny ? "Any" : "All")); foreach (RequestedItem item in RequestedItems.Values) { - Debug.ULogChannel("FSM", " - {0}, min: {1}, max: {2}", item.Type, item.MinAmountRequested, item.MaxAmountRequested); + UnityDebugger.Debugger.Log("FSM", string.Format(" - {0}, min: {1}, max: {2}", item.Type, item.MinAmountRequested, item.MaxAmountRequested)); } } } diff --git a/Assets/Scripts/Models/Job/JobQueue.cs b/Assets/Scripts/Models/Job/JobQueue.cs index 4f273f306..5548fdd30 100644 --- a/Assets/Scripts/Models/Job/JobQueue.cs +++ b/Assets/Scripts/Models/Job/JobQueue.cs @@ -131,14 +131,14 @@ public Job GetJob(Character character) { if (CharacterCantReachHelper(job, character)) { - Debug.ULogError("Character could not find a path to the job site."); + UnityDebugger.Debugger.LogError("Character could not find a path to the job site."); ReInsertHelper(job); continue; } else if ((job.RequestedItems.Count > 0) && !job.CanGetToInventory(character)) { job.AddCharCantReach(character); - Debug.ULogError("Character could not find a path to any inventory available."); + UnityDebugger.Debugger.LogError("Character could not find a path to any inventory available."); ReInsertHelper(job); continue; } @@ -273,6 +273,6 @@ private void ReInsertHelper(Job job) [System.Diagnostics.Conditional("FSM_DEBUG_LOG")] private void DebugLog(string message, params object[] par) { - Debug.ULogChannel("FSM", message, par); + UnityDebugger.Debugger.LogFormat("FSM", message, par); } } diff --git a/Assets/Scripts/Models/Prototypes/PrototypeMap.cs b/Assets/Scripts/Models/Prototypes/PrototypeMap.cs index 8af2aedb2..15ef30c46 100644 --- a/Assets/Scripts/Models/Prototypes/PrototypeMap.cs +++ b/Assets/Scripts/Models/Prototypes/PrototypeMap.cs @@ -6,11 +6,13 @@ // file LICENSE, which is part of this source code package, for details. // ==================================================== #endregion + using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Xml; +using UnityEngine; /// /// A class that holds prototypes to be used later. @@ -132,7 +134,7 @@ public void Add(T proto) { if (Has(proto.Type)) { - Debug.ULogWarningChannel("PrototypeMap", "Trying to register a prototype of type '{0}' which already exists. Overwriting.", proto.Type); + UnityDebugger.Debugger.LogWarningFormat("PrototypeMap", "Trying to register a prototype of type '{0}' which already exists. Overwriting.", proto.Type); } Set(proto); @@ -158,12 +160,12 @@ public void LoadPrototypes(string xmlText) } else { - Debug.ULogErrorChannel("PrototypeMap", "The '" + listTag + "' prototype definition file doesn't have any '" + elementTag + "' elements."); + UnityDebugger.Debugger.LogError("PrototypeMap", "The '" + listTag + "' prototype definition file doesn't have any '" + elementTag + "' elements."); } } else { - Debug.ULogErrorChannel("PrototypeMap", "Did not find a '" + listTag + "' element in the prototype definition file."); + UnityDebugger.Debugger.LogError("PrototypeMap", "Did not find a '" + listTag + "' element in the prototype definition file."); } } diff --git a/Assets/Scripts/Models/Scheduler/ScheduledEvent.cs b/Assets/Scripts/Models/Scheduler/ScheduledEvent.cs index c284f34b2..738f5ba34 100644 --- a/Assets/Scripts/Models/Scheduler/ScheduledEvent.cs +++ b/Assets/Scripts/Models/Scheduler/ScheduledEvent.cs @@ -238,7 +238,7 @@ public void Fire() { if (Finished) { - Debug.ULogChannel("ScheduledEvent", "Scheduled event '" + Name + "' finished last repeat already -- not firing again."); + UnityDebugger.Debugger.Log("ScheduledEvent", "Scheduled event '" + Name + "' finished last repeat already -- not firing again."); return; } diff --git a/Assets/Scripts/Models/Scheduler/Scheduler.cs b/Assets/Scripts/Models/Scheduler/Scheduler.cs index 2f1873b38..9c22067fa 100644 --- a/Assets/Scripts/Models/Scheduler/Scheduler.cs +++ b/Assets/Scripts/Models/Scheduler/Scheduler.cs @@ -91,7 +91,7 @@ public void ScheduleEvent(string name, float cooldown, float timeToWait, bool re { if (PrototypeManager.ScheduledEvent.Has(name) == false) { - Debug.ULogWarningChannel("Scheduler", "Tried to schedule an event from a prototype '{0}' which does not exist. Bailing.", name); + UnityDebugger.Debugger.LogWarningFormat("Scheduler", "Tried to schedule an event from a prototype '{0}' which does not exist. Bailing.", name); return; } @@ -110,7 +110,7 @@ public void RegisterEvent(ScheduledEvent evt) { if (IsRegistered(evt)) { - Debug.ULogChannel("Scheduler", "Event '{0}' registered more than once.", evt.Name); + UnityDebugger.Debugger.LogFormat("Scheduler", "Event '{0}' registered more than once.", evt.Name); } eventsToAddNextTick.Add(evt); diff --git a/Assets/Scripts/Models/Settings.cs b/Assets/Scripts/Models/Settings.cs index d2d3002f3..0d89d18ff 100644 --- a/Assets/Scripts/Models/Settings.cs +++ b/Assets/Scripts/Models/Settings.cs @@ -55,7 +55,7 @@ public static string GetSettingWithOverwrite(string key, string defaultValue) { if (settingsDict == null) { - Debug.ULogErrorChannel("Settings", "Settings Dictionary was not loaded!"); + UnityDebugger.Debugger.LogError("Settings", "Settings Dictionary was not loaded!"); return defaultValue; } @@ -81,7 +81,7 @@ public static void SetSetting(string key, string value) { if (settingsDict == null) { - Debug.ULogErrorChannel("Settings", "Settings Dictionary was not loaded!"); + UnityDebugger.Debugger.LogError("Settings", "Settings Dictionary was not loaded!"); return; } @@ -91,13 +91,13 @@ public static void SetSetting(string key, string value) // update the setting. settingsDict.Remove(key); settingsDict.Add(key, value); - Debug.ULogChannel("Settings", "Updated setting : " + key + " to value of " + value); + UnityDebugger.Debugger.Log("Settings", "Updated setting : " + key + " to value of " + value); } else { // add a new setting to the dict. settingsDict.Add(key, value); - Debug.ULogChannel("Settings", "Created new setting : " + key + " to value of " + value); + UnityDebugger.Debugger.Log("Settings", "Created new setting : " + key + " to value of " + value); } } @@ -106,7 +106,7 @@ public static T GetSetting(string key, T defaultValue) { if (settingsDict == null) { - Debug.ULogErrorChannel("Settings", "Settings Dictionary was not loaded!"); + UnityDebugger.Debugger.LogError("Settings", "Settings Dictionary was not loaded!"); return defaultValue; } @@ -120,21 +120,21 @@ public static T GetSetting(string key, T defaultValue) } catch (Exception exception) { - Debug.ULogErrorChannel("Settings", "Exception {0} whyle trying to convert {1} to type {2}", exception.Message, value, typeof(T)); + UnityDebugger.Debugger.LogErrorFormat("Settings", "Exception {0} whyle trying to convert {1} to type {2}", exception.Message, value, typeof(T)); return defaultValue; } } - Debug.ULogWarningChannel("Settings", "Attempted to access a setting that was not loaded from Settings.json:\t" + key); + UnityDebugger.Debugger.LogWarning("Settings", "Attempted to access a setting that was not loaded from Settings.json:\t" + key); return defaultValue; } public static void SaveSettings() { - Debug.ULogChannel("Settings", "Settings have changed, so there are settings to save!"); + UnityDebugger.Debugger.Log("Settings", "Settings have changed, so there are settings to save!"); string jsonData = JsonConvert.SerializeObject(settingsDict, Newtonsoft.Json.Formatting.Indented); - Debug.ULogChannel("Settings", "Saving settings :: " + jsonData); + UnityDebugger.Debugger.Log("Settings", "Saving settings :: " + jsonData); // Save the document. try @@ -146,8 +146,8 @@ public static void SaveSettings() } catch (Exception e) { - Debug.ULogWarningChannel("Settings", "Settings could not be saved to " + userSettingsFilePath); - Debug.ULogWarningChannel("Settings", e.Message); + UnityDebugger.Debugger.LogWarning("Settings", "Settings could not be saved to " + userSettingsFilePath); + UnityDebugger.Debugger.LogWarning("Settings", e.Message); } } @@ -161,7 +161,7 @@ public static void LoadSettings() // If that doesn't work fall back to the hard coded FallbackSettingJson above. if (System.IO.File.Exists(userSettingsFilePath) == false) { - Debug.ULogChannel("Settings", "User settings file could not be found at '" + userSettingsFilePath + "'. Falling back to defaults."); + UnityDebugger.Debugger.Log("Settings", "User settings file could not be found at '" + userSettingsFilePath + "'. Falling back to defaults."); settingsJsonText = DefaultSettingsJsonFallback(); } @@ -173,8 +173,8 @@ public static void LoadSettings() } catch (Exception e) { - Debug.ULogWarningChannel("Settings", "User settings file could not be found at '" + userSettingsFilePath + "'. Falling back to defaults."); - Debug.ULogWarningChannel("Settings", e.Message); + UnityDebugger.Debugger.LogWarning("Settings", "User settings file could not be found at '" + userSettingsFilePath + "'. Falling back to defaults."); + UnityDebugger.Debugger.LogWarning("Settings", e.Message); settingsJsonText = DefaultSettingsJsonFallback(); } @@ -189,7 +189,7 @@ private static string DefaultSettingsJsonFallback() if (System.IO.File.Exists(DefaultSettingsFilePath) == false) { - Debug.ULogWarningChannel("Settings", "Default settings file could not be found at '" + DefaultSettingsFilePath + "'. Falling back to Settings.cs defaults."); + UnityDebugger.Debugger.LogWarning("Settings", "Default settings file could not be found at '" + DefaultSettingsFilePath + "'. Falling back to Settings.cs defaults."); try { @@ -197,8 +197,8 @@ private static string DefaultSettingsJsonFallback() } catch (Exception e) { - Debug.ULogWarningChannel("Settings", "Default settings file could not be created at '" + DefaultSettingsFilePath + "'."); - Debug.ULogWarningChannel("Settings", e.Message); + UnityDebugger.Debugger.LogWarning("Settings", "Default settings file could not be created at '" + DefaultSettingsFilePath + "'."); + UnityDebugger.Debugger.LogWarning("Settings", e.Message); } } else @@ -209,8 +209,8 @@ private static string DefaultSettingsJsonFallback() } catch (Exception e) { - Debug.ULogWarningChannel("Settings", "Settings file at '" + DefaultSettingsFilePath + "' could not be read. Falling back to Settings.cs defaults."); - Debug.ULogWarningChannel("Settings", e.Message); + UnityDebugger.Debugger.LogWarning("Settings", "Settings file at '" + DefaultSettingsFilePath + "' could not be read. Falling back to Settings.cs defaults."); + UnityDebugger.Debugger.LogWarning("Settings", e.Message); } } diff --git a/Assets/Scripts/Models/Ships/Ship.cs b/Assets/Scripts/Models/Ships/Ship.cs index a56565095..42dde5586 100644 --- a/Assets/Scripts/Models/Ships/Ship.cs +++ b/Assets/Scripts/Models/Ships/Ship.cs @@ -238,7 +238,7 @@ public void SetDestination(Furniture goalBerth) { if (goalBerth == null) { - Debug.ULogError("Ships", "Destination berth should not be set to null this way. Use Berth property or SetDestination(x,y) instead."); + UnityDebugger.Debugger.LogError("Ships", "Destination berth should not be set to null this way. Use Berth property or SetDestination(x,y) instead."); return; } @@ -297,7 +297,7 @@ public void UnwrapAtBerth() // Change tile to defined contents if (tile.Type.Equals(TileType.Empty) == false || tile.Furniture != null) { - Debug.ULogErrorChannel("Ships", "Tile " + tile.X + "," + tile.Y + " is not empty. Replacing anyway."); + UnityDebugger.Debugger.LogError("Ships", "Tile " + tile.X + "," + tile.Y + " is not empty. Replacing anyway."); } tile.SetTileType(PrototypeManager.TileType.Get(tileTypes[x, y])); @@ -432,7 +432,7 @@ private Tile GetTile(World world, Furniture berth, int x, int y, int z) default: worldX = 0; worldY = 0; - Debug.ULogErrorChannel("Ships", "Invalid berthing direction: " + BerthDirection); + UnityDebugger.Debugger.LogError("Ships", "Invalid berthing direction: " + BerthDirection); break; } diff --git a/Assets/Scripts/Models/Ships/ShipManager.cs b/Assets/Scripts/Models/Ships/ShipManager.cs index df0ae81b6..6061698a1 100644 --- a/Assets/Scripts/Models/Ships/ShipManager.cs +++ b/Assets/Scripts/Models/Ships/ShipManager.cs @@ -67,7 +67,7 @@ public Ship AddShip(string type, float x, float y) { if (PrototypeManager.Ship.Has(type) == false) { - Debug.ULogErrorChannel("Ships", "Prototype `" + type + "` does not exist"); + UnityDebugger.Debugger.LogError("Ships", "Prototype `" + type + "` does not exist"); return null; } @@ -139,7 +139,7 @@ public void DeberthShip(Furniture berth) { if (berthShipMap.ContainsKey(berth) == false || berthShipMap[berth] == null) { - Debug.ULogErrorChannel("Ships", "No ship berthed here: " + berth.Tile.ToString()); + UnityDebugger.Debugger.LogError("Ships", "No ship berthed here: " + berth.Tile.ToString()); return; } diff --git a/Assets/Scripts/Pathfinding/Path_AStar.cs b/Assets/Scripts/Pathfinding/Path_AStar.cs index b3df7c5ce..eda8e203a 100644 --- a/Assets/Scripts/Pathfinding/Path_AStar.cs +++ b/Assets/Scripts/Pathfinding/Path_AStar.cs @@ -20,7 +20,7 @@ public Path_AStar(Queue path) { if (path == null || !path.Any()) { - Debug.ULogWarningChannel("Path_AStar", "Created path with no tiles, is this intended?"); + UnityDebugger.Debugger.LogWarning("Path_AStar", "Created path with no tiles, is this intended?"); } this.path = path; @@ -55,7 +55,7 @@ public Path_AStar(World world, Tile tileStart, Pathfinder.GoalEvaluator isGoal, // Make sure our start/end tiles are in the list of nodes! if (nodes.ContainsKey(tileStart) == false) { - Debug.ULogErrorChannel("Path_AStar", "The starting tile isn't in the list of nodes!"); + UnityDebugger.Debugger.LogError("Path_AStar", "The starting tile isn't in the list of nodes!"); return; } @@ -141,13 +141,13 @@ public Tile Dequeue() { if (path == null) { - Debug.ULogErrorChannel("Path_AStar", "Attempting to dequeue from an null path."); + UnityDebugger.Debugger.LogError("Path_AStar", "Attempting to dequeue from an null path."); return null; } if (path.Count <= 0) { - Debug.ULogErrorChannel("Path_AStar", "Path queue is zero or less elements long."); + UnityDebugger.Debugger.LogError("Path_AStar", "Path queue is zero or less elements long."); return null; } @@ -168,7 +168,7 @@ public Tile EndTile() { if (path == null || path.Count == 0) { - Debug.ULogChannel("Path_AStar", "Path is null or empty."); + UnityDebugger.Debugger.Log("Path_AStar", "Path is null or empty."); return null; } diff --git a/Assets/Scripts/Pathfinding/Path_RoomGraph.cs b/Assets/Scripts/Pathfinding/Path_RoomGraph.cs index 151679bd2..70ecf3738 100644 --- a/Assets/Scripts/Pathfinding/Path_RoomGraph.cs +++ b/Assets/Scripts/Pathfinding/Path_RoomGraph.cs @@ -15,12 +15,12 @@ public class Path_RoomGraph public Path_RoomGraph(World world) { - Debug.ULogChannel("Path_RoomGraph", "Entered Path_RoomGraph"); + UnityDebugger.Debugger.Log("Path_RoomGraph", "Entered Path_RoomGraph"); // Loop through all rooms of the world // For each room, create a node nodes = new Dictionary>(); - Debug.ULogChannel("Path_RoomGraph", "There are " + world.RoomManager.Count + " Rooms"); + UnityDebugger.Debugger.Log("Path_RoomGraph", "There are " + world.RoomManager.Count + " Rooms"); foreach (Room room in world.RoomManager) { Path_Node n = new Path_Node(); @@ -28,7 +28,7 @@ public Path_RoomGraph(World world) nodes.Add(room, n); } - Debug.ULogChannel("Path_RoomGraph", "Created " + nodes.Count + " nodes."); + UnityDebugger.Debugger.Log("Path_RoomGraph", "Created " + nodes.Count + " nodes."); // Now loop through all nodes again // Create edges for neighbours @@ -44,10 +44,10 @@ public Path_RoomGraph(World world) foreach (Room room in nodes.Keys) { - Debug.ULogChannel("Path_RoomGraph", "Room " + room.ID + " has edges to:"); + UnityDebugger.Debugger.Log("Path_RoomGraph", "Room " + room.ID + " has edges to:"); foreach (Path_Edge edge in nodes[room].edges) { - Debug.ULogChannel("Path_RoomGraph", "\tEdge connects to " + edge.node.data.ID); + UnityDebugger.Debugger.Log("\tEdge connects to " + edge.node.data.ID); } } } diff --git a/Assets/Scripts/Pathfinding/Path_TileGraph.cs b/Assets/Scripts/Pathfinding/Path_TileGraph.cs index 86f010791..77f33c873 100644 --- a/Assets/Scripts/Pathfinding/Path_TileGraph.cs +++ b/Assets/Scripts/Pathfinding/Path_TileGraph.cs @@ -17,7 +17,7 @@ public class Path_TileGraph public Path_TileGraph(World world) { - Debug.ULogChannel("Path_TileGraph", "Entered Path_TileGraph"); + UnityDebugger.Debugger.Log("Path_TileGraph", "Entered Path_TileGraph"); /* * Loop through all tiles of the world @@ -44,7 +44,7 @@ public Path_TileGraph(World world) } } - Debug.ULogChannel("Path_TileGraph", "Created " + nodes.Count + " nodes."); + UnityDebugger.Debugger.Log("Path_TileGraph", "Created " + nodes.Count + " nodes."); // Now loop through all nodes again // Create edges for neighbours diff --git a/Assets/Scripts/Pathfinding/Pathfinder.cs b/Assets/Scripts/Pathfinding/Pathfinder.cs index 008fffd5f..e1ff0dcbe 100644 --- a/Assets/Scripts/Pathfinding/Pathfinder.cs +++ b/Assets/Scripts/Pathfinding/Pathfinder.cs @@ -345,7 +345,7 @@ public static Tile GetNearestExit(List roomList) [System.Diagnostics.Conditional("PATHFINDER_DEBUG_LOG")] private static void DebugLog(string message, params object[] par) { - Debug.ULogChannel("Pathfinding", message, par); + UnityDebugger.Debugger.LogFormat("Pathfinding", message, par); } [System.Diagnostics.Conditional("PATHFINDER_DEBUG_LOG")] diff --git a/Assets/Scripts/Pathfinding/PathfindingPriorityQueue.cs b/Assets/Scripts/Pathfinding/PathfindingPriorityQueue.cs index 17a0856b2..f4126b624 100644 --- a/Assets/Scripts/Pathfinding/PathfindingPriorityQueue.cs +++ b/Assets/Scripts/Pathfinding/PathfindingPriorityQueue.cs @@ -71,7 +71,7 @@ public void Enqueue(T data, float priority) { if (mapDataToWrappedNode.ContainsKey(data)) { - Debug.ULogErrorChannel("PathfindingPriorityQueue", "Priority Queue can't re-enqueue a node that's already enqueued."); + UnityDebugger.Debugger.LogError("PathfindingPriorityQueue", "Priority Queue can't re-enqueue a node that's already enqueued."); return; } diff --git a/Assets/Scripts/Pathfinding/RoomPath_AStar.cs b/Assets/Scripts/Pathfinding/RoomPath_AStar.cs index 5424af781..4dbdb928a 100644 --- a/Assets/Scripts/Pathfinding/RoomPath_AStar.cs +++ b/Assets/Scripts/Pathfinding/RoomPath_AStar.cs @@ -22,7 +22,7 @@ public RoomPath_AStar(Queue path) { if (path == null || !path.Any()) { - Debug.ULogWarningChannel("Path_AStar", "Created path with no tiles, is this intended?"); + UnityDebugger.Debugger.LogWarning("Path_AStar", "Created path with no tiles, is this intended?"); } this.path = path; @@ -57,7 +57,7 @@ public RoomPath_AStar(World world, Room roomStart, Pathfinder.RoomGoalEvaluator // Make sure our start/end tiles are in the list of nodes! if (nodes.ContainsKey(roomStart) == false) { - Debug.ULogErrorChannel("Path_AStar", "The starting tile isn't in the list of nodes!"); + UnityDebugger.Debugger.LogError("Path_AStar", "The starting tile isn't in the list of nodes!"); return; } @@ -141,13 +141,13 @@ public Room Dequeue() { if (path == null) { - Debug.ULogErrorChannel("Path_AStar", "Attempting to dequeue from an null path."); + UnityDebugger.Debugger.LogError("Path_AStar", "Attempting to dequeue from an null path."); return null; } if (path.Count <= 0) { - Debug.ULogErrorChannel("Path_AStar", "Path queue is zero or less elements long."); + UnityDebugger.Debugger.LogError("Path_AStar", "Path queue is zero or less elements long."); return null; } @@ -168,7 +168,7 @@ public Room EndRoom() { if (path == null || path.Count == 0) { - Debug.ULogChannel("Path_AStar", "Path is null or empty."); + UnityDebugger.Debugger.Log("Path_AStar", "Path is null or empty."); return null; } diff --git a/Assets/Scripts/State/JobState.cs b/Assets/Scripts/State/JobState.cs index e144768b0..b0f82ddb7 100644 --- a/Assets/Scripts/State/JobState.cs +++ b/Assets/Scripts/State/JobState.cs @@ -100,7 +100,7 @@ public override void Interrupt() private void AbandonJob() { DebugLog(" - Job abandoned!"); - Debug.ULogChannel("Character", character.GetName() + " abandoned their job."); + UnityDebugger.Debugger.Log("Character", character.GetName() + " abandoned their job."); Job.OnJobCompleted -= OnJobCompleted; Job.OnJobStopped -= OnJobStopped; @@ -134,7 +134,7 @@ private void OnJobStopped(Job stoppedJob) if (Job != stoppedJob) { - Debug.ULogErrorChannel("Character", "Character being told about job that isn't his. You forgot to unregister something."); + UnityDebugger.Debugger.LogError("Character", "Character being told about job that isn't his. You forgot to unregister something."); return; } } @@ -153,7 +153,7 @@ private void OnJobCompleted(Job finishedJob) if (Job != finishedJob) { - Debug.ULogErrorChannel("Character", "Character being told about job that isn't his. You forgot to unregister something."); + UnityDebugger.Debugger.LogError("Character", "Character being told about job that isn't his. You forgot to unregister something."); return; } } diff --git a/Assets/Scripts/State/MoveState.cs b/Assets/Scripts/State/MoveState.cs index 5bd4a9d18..5bbfed7f7 100644 --- a/Assets/Scripts/State/MoveState.cs +++ b/Assets/Scripts/State/MoveState.cs @@ -86,7 +86,7 @@ public override void Update(float deltaTime) // so that we don't waste a bunch of time walking towards a dead end. // To save CPU, maybe we can only check every so often? // Or maybe we should register a callback to the OnTileChanged event? - // Debug.ULogErrorChannel("FIXME", "A character was trying to enter an unwalkable tile."); + // UnityDebugger.Debugger.LogErrorChannel("FIXME", "A character was trying to enter an unwalkable tile."); // Should the character show that he is surprised to find a wall? Finished(); diff --git a/Assets/Scripts/State/State.cs b/Assets/Scripts/State/State.cs index 9119b0157..c24fa7831 100644 --- a/Assets/Scripts/State/State.cs +++ b/Assets/Scripts/State/State.cs @@ -66,7 +66,7 @@ protected void Finished() protected void DebugLog(string message, params object[] par) { string prefixedMessage = string.Format("{0} {1}: {2}", character.GetName(), StateStack(), message); - Debug.ULogChannel("FSM", prefixedMessage, par); + UnityDebugger.Debugger.LogFormat("FSM", prefixedMessage, par); } private string StateStack() diff --git a/Assets/Scripts/UI/DialogBox/DialogBox.cs b/Assets/Scripts/UI/DialogBox/DialogBox.cs index 3eb650eca..61774c5e8 100644 --- a/Assets/Scripts/UI/DialogBox/DialogBox.cs +++ b/Assets/Scripts/UI/DialogBox/DialogBox.cs @@ -39,7 +39,7 @@ public virtual void CloseDialog() Closed = null; - Debug.ULogChannel("ModDialogBox", "openedWhileModal=" + openedWhileModal.ToString()); + UnityDebugger.Debugger.Log("ModDialogBox", "openedWhileModal=" + openedWhileModal.ToString()); if (!openedWhileModal) { GameController.Instance.IsModal = false; diff --git a/Assets/Scripts/UI/DialogBox/DialogBoxManager.cs b/Assets/Scripts/UI/DialogBox/DialogBoxManager.cs index a9fc99ba2..a868dfc2a 100644 --- a/Assets/Scripts/UI/DialogBox/DialogBoxManager.cs +++ b/Assets/Scripts/UI/DialogBox/DialogBoxManager.cs @@ -95,7 +95,7 @@ public DialogBox ShowDialogBoxByName(string dialogName) } else { - Debug.ULogErrorChannel("ModDialogBox", "Couldn't find dialog box with name" + dialogName); + UnityDebugger.Debugger.LogError("ModDialogBox", "Couldn't find dialog box with name" + dialogName); return null; } } @@ -170,7 +170,7 @@ private Toggle CreatePinQuestButton() /// private void LoadModdedDialogBoxes() { - Debug.ULogChannel("ModDialogBox", "Loading xml dialog boxes"); + UnityDebugger.Debugger.Log("ModDialogBox", "Loading xml dialog boxes"); string dialogBoxPath = Path.Combine(Application.streamingAssetsPath, "UI"); dialogBoxPath = Path.Combine(dialogBoxPath, "DialogBoxes"); DirectoryInfo dialogBoxPathInfo = new DirectoryInfo(dialogBoxPath); @@ -180,7 +180,7 @@ private void LoadModdedDialogBoxes() switch (fileInfo.Extension) { case ".xml": - Debug.ULogChannel("ModDialogBox", "Found xml element:" + fileInfo.Name); + UnityDebugger.Debugger.Log("ModDialogBox", "Found xml element:" + fileInfo.Name); GameObject dialogBoxPrefab = CreateDialogGO("DB_MOD", "Modded Dialog Box"); ModDialogBox modDialogBox = dialogBoxPrefab.GetComponent(); modDialogBox.LoadFromXML(fileInfo); @@ -188,7 +188,7 @@ private void LoadModdedDialogBoxes() DialogBoxes[modDialogBox.Title] = modDialogBox; break; case ".lua": - Debug.ULogChannel("ModDialogBox", "Found lua element:" + fileInfo.Name); + UnityDebugger.Debugger.Log("ModDialogBox", "Found lua element:" + fileInfo.Name); WorldController.Instance.modsManager.LoadFunctionsInFile(fileInfo, "ModDialogBox"); break; } diff --git a/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadGame.cs b/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadGame.cs index ca7562c76..1a4ad1689 100644 --- a/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadGame.cs +++ b/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadGame.cs @@ -137,7 +137,7 @@ public void LoadWorld(string filePath) // from the load dialog box. // Get the file name from the save file dialog box. - Debug.ULogChannel("DialogBoxLoadGame", "LoadWorld button was clicked."); + UnityDebugger.Debugger.Log("DialogBoxLoadGame", "LoadWorld button was clicked."); DialogBoxManager dbm = GameObject.Find("Dialog Boxes").GetComponent(); dbm.dialogBoxPromptOrInfo.SetPrompt("message_loading_game"); diff --git a/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadSaveGame.cs b/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadSaveGame.cs index c6604b5d4..0ae65f9ef 100644 --- a/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadSaveGame.cs +++ b/Assets/Scripts/UI/DialogBox/FileSaveLoad/DialogBoxLoadSaveGame.cs @@ -29,7 +29,7 @@ public void EnsureDirectoryExists(string directoryPath) { if (Directory.Exists(directoryPath) == false) { - Debug.ULogWarningChannel("DialogBoxLoadSaveGame", "Directory: " + directoryPath + " doesn't exist - creating."); + UnityDebugger.Debugger.LogWarning("DialogBoxLoadSaveGame", "Directory: " + directoryPath + " doesn't exist - creating."); Directory.CreateDirectory(directoryPath); } } diff --git a/Assets/Scripts/UI/DialogBox/Mod/ModDialogBox.cs b/Assets/Scripts/UI/DialogBox/Mod/ModDialogBox.cs index 9a2257e2c..355ac7c6a 100644 --- a/Assets/Scripts/UI/DialogBox/Mod/ModDialogBox.cs +++ b/Assets/Scripts/UI/DialogBox/Mod/ModDialogBox.cs @@ -151,7 +151,7 @@ public void LoadFromXML(FileInfo file) } catch (System.Exception error) { - Debug.ULogErrorChannel("ModDialogBox", "Error converting image:" + error.Message); + UnityDebugger.Debugger.LogError("ModDialogBox", "Error converting image:" + error.Message); return; } @@ -201,7 +201,7 @@ public void LoadFromXML(FileInfo file) } catch (System.Exception error) { - Debug.ULogErrorChannel("ModDialogBox", "Error deserializing data:" + error.Message); + UnityDebugger.Debugger.LogError("ModDialogBox", "Error deserializing data:" + error.Message); } } } diff --git a/Assets/Scripts/UI/DialogBox/PromptOrInfo/DialogBoxPromptOrInfo.cs b/Assets/Scripts/UI/DialogBox/PromptOrInfo/DialogBoxPromptOrInfo.cs index c98294786..122d415a7 100644 --- a/Assets/Scripts/UI/DialogBox/PromptOrInfo/DialogBoxPromptOrInfo.cs +++ b/Assets/Scripts/UI/DialogBox/PromptOrInfo/DialogBoxPromptOrInfo.cs @@ -62,7 +62,7 @@ public void SetButtons(Table buttons) button.gameObject.SetActive(false); } - Debug.ULogChannel("ModDialogBox", "Table length:" + buttons.Length.ToString()); + UnityDebugger.Debugger.Log("ModDialogBox", "Table length:" + buttons.Length.ToString()); for (int i = 1; i <= buttons.Length; i++) { switch (buttons.RawGet(i).ToObject()) diff --git a/Assets/Scripts/UI/HeadlineController.cs b/Assets/Scripts/UI/HeadlineController.cs index 07a0d5ef8..d94ab8931 100644 --- a/Assets/Scripts/UI/HeadlineController.cs +++ b/Assets/Scripts/UI/HeadlineController.cs @@ -54,7 +54,7 @@ private void UpdateHeadline(string newHeadline) canvasGroup.interactable = true; canvasGroup.blocksRaycasts = true; - Debug.ULogChannel("Headline", newHeadline); + UnityDebugger.Debugger.Log("Headline", newHeadline); textBox.text = newHeadline; Scheduler.Scheduler.Current.DeregisterEvent(scheduledEvent); diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DevConsole.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DevConsole.cs index f3100757a..3fe12a448 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DevConsole.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DevConsole.cs @@ -583,7 +583,7 @@ private void OnEnable() if (instance != this && instance != null) { // Destroy instance. - Debug.ULogErrorChannel("DevConsole", "There can only be one Console per project. Deleting instance with name: " + instance.gameObject.name); + UnityDebugger.Debugger.LogError("DevConsole", "There can only be one Console per project. Deleting instance with name: " + instance.gameObject.name); Destroy(instance.gameObject); } @@ -613,7 +613,7 @@ private void Start() if (textArea == null || inputField == null || autoComplete == null || scrollRect == null || root == null) { gameObject.SetActive(false); - Debug.ULogError("DevConsole", "Missing gameobjects, look at the serializeable fields"); + UnityDebugger.Debugger.LogError("DevConsole", "Missing gameobjects, look at the serializeable fields"); } textArea.fontSize = CommandSettings.FontSize; diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CSharpCommand.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CSharpCommand.cs index 43c38fcb7..84dbf9d52 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CSharpCommand.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CSharpCommand.cs @@ -112,7 +112,7 @@ public void ExecuteCommand(string arguments) { // Debug Error DevConsole.LogError(Errors.ExecuteConsoleError.Description(this)); - Debug.ULogErrorChannel("DevConsole", e.ToString()); + UnityDebugger.Debugger.LogError("DevConsole", e.ToString()); } } diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandBase.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandBase.cs index 55ce239c2..fffb36864 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandBase.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandBase.cs @@ -145,11 +145,8 @@ protected T GetValueType(string arg, Type typeVariable = null) } else if (arg.Contains('[')) { - Debug.LogWarning("Object Mode"); arg = arg.Trim().Trim('[', ']'); - Debug.LogWarning(arg); - string pattern = @"\,?((?:\"".*?\"")|(?:[^\,]*))\,?"; string[] args = Regex.Matches(arg, pattern) @@ -198,7 +195,6 @@ protected T GetValueType(string arg, Type typeVariable = null) if (chosenConstructor == null) { - args.ToList().ForEach(x => Debug.LogWarning(x)); throw new Exception("The entered value is not a valid " + typeOfT + " value"); } else diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandParams.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandParams.cs index 3a8d6aea9..6ceea7784 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandParams.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandParams.cs @@ -52,7 +52,7 @@ protected override object[] ParseArguments(string message) } catch (Exception e) { - Debug.ULogErrorChannel("DevConsole", e.ToString()); + UnityDebugger.Debugger.LogError("DevConsole", e.ToString()); return new object[] { }; } } diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithFourParameters.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithFourParameters.cs index 66b75a45e..0fb145855 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithFourParameters.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithFourParameters.cs @@ -62,7 +62,7 @@ protected override object[] ParseArguments(string message) } catch (Exception e) { - Debug.ULogErrorChannel("DevConsole", e.ToString()); + UnityDebugger.Debugger.LogError("DevConsole", e.ToString()); return new object[] { }; } } diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithOneParameter.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithOneParameter.cs index a0d79082d..84c493225 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithOneParameter.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithOneParameter.cs @@ -61,7 +61,7 @@ protected override object[] ParseArguments(string args) } catch (Exception e) { - Debug.ULogErrorChannel("DevConsole", e.ToString()); + UnityDebugger.Debugger.LogError("DevConsole", e.ToString()); return new object[] { }; } } diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithThreeParameters.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithThreeParameters.cs index 8550418e7..e3a538ca5 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithThreeParameters.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithThreeParameters.cs @@ -62,7 +62,7 @@ protected override object[] ParseArguments(string message) } catch (Exception e) { - Debug.ULogErrorChannel("DevConsole", e.ToString()); + UnityDebugger.Debugger.LogError("DevConsole", e.ToString()); return new object[] { }; } } diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithTwoParameters.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithTwoParameters.cs index 778bd2063..beff4cec6 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithTwoParameters.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/CommandWithTwoParameters.cs @@ -62,7 +62,7 @@ protected override object[] ParseArguments(string message) } catch (Exception e) { - Debug.ULogErrorChannel("DevConsole", e.ToString()); + UnityDebugger.Debugger.LogError("DevConsole", e.ToString()); return new object[] { }; } } diff --git a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/InvokeCommand.cs b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/InvokeCommand.cs index 2bda7c9ed..7a118a763 100644 --- a/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/InvokeCommand.cs +++ b/Assets/Scripts/UI/InGameUI/DevConsole/DeveloperConsole.CommandTypes/InvokeCommand.cs @@ -72,7 +72,7 @@ public InvokeCommand(string title, string functionName, string descriptiveText, // This will only happen if the semi colon is the last element in the string Parameters = string.Empty; - Debug.ULogWarningChannel("DevConsole", "Parameters had a semicolon as a last character this is an illegal string."); + UnityDebugger.Debugger.LogWarning("DevConsole", "Parameters had a semicolon as a last character this is an illegal string."); } } else @@ -125,7 +125,7 @@ public InvokeCommand(string title, string functionName, string descriptiveText, // This in most cases is fine, just means that when you call it, // it won't work (unless the type is object) types[i] = typeof(object); - Debug.ULogErrorChannel("DevConsole", e.Message); + UnityDebugger.Debugger.LogError("DevConsole", e.Message); } } } @@ -254,7 +254,7 @@ protected override object[] ParseArguments(string arguments) } catch (Exception e) { - Debug.ULogErrorChannel("DevConsole", e.ToString()); + UnityDebugger.Debugger.LogError("DevConsole", e.ToString()); } return new object[] { }; diff --git a/Assets/Scripts/UI/InGameUI/PerformanceHUD/PerformanceHUDManager.cs b/Assets/Scripts/UI/InGameUI/PerformanceHUD/PerformanceHUDManager.cs index c2a29c83e..38018bb9b 100644 --- a/Assets/Scripts/UI/InGameUI/PerformanceHUD/PerformanceHUDManager.cs +++ b/Assets/Scripts/UI/InGameUI/PerformanceHUD/PerformanceHUDManager.cs @@ -90,7 +90,7 @@ private void Start() // Just a guard statement essentially if (PerformanceComponentGroups.groups.Length > groupSetting) { - Debug.ULogChannel("Performance", "The current channel was set to index: " + groupSetting); + UnityDebugger.Debugger.Log("Performance", "The current channel was set to index: " + groupSetting); currentGroup = PerformanceComponentGroups.groups[groupSetting]; // Order by ascending using Linq @@ -102,12 +102,12 @@ private void Start() else if (groupSetting > 0 && PerformanceComponentGroups.groups.Length > 0) { // If so then just set to first option (normally none) - Debug.ULogErrorChannel("Performance", "Index out of range: Current group is set to 0" + groupSetting); + UnityDebugger.Debugger.LogError("Performance", "Index out of range: Current group is set to 0" + groupSetting); } else { // Else set to none (none is a readonly so it should always exist) - Debug.ULogErrorChannel("Performance", "Array Empty: The PerformanceComponentGroups.groups array is empty"); + UnityDebugger.Debugger.LogError("Performance", "Array Empty: The PerformanceComponentGroups.groups array is empty"); currentGroup = PerformanceComponentGroups.None; } diff --git a/Assets/Scripts/UI/MouseOver.cs b/Assets/Scripts/UI/MouseOver.cs index 5b476c0f5..a2a332d54 100644 --- a/Assets/Scripts/UI/MouseOver.cs +++ b/Assets/Scripts/UI/MouseOver.cs @@ -48,7 +48,7 @@ private void Start() if (text == null) { - Debug.ULogErrorChannel("MouseOver", "MouseOver: No 'Text' UI component on this object."); + UnityDebugger.Debugger.LogError("MouseOver", "MouseOver: No 'Text' UI component on this object."); this.enabled = false; return; } @@ -56,7 +56,7 @@ private void Start() mouseController = WorldController.Instance.mouseController; if (mouseController == null) { - Debug.ULogErrorChannel("MouseOver", "How do we not have an instance of mouse controller?"); + UnityDebugger.Debugger.LogError("MouseOver", "How do we not have an instance of mouse controller?"); this.enabled = false; return; } diff --git a/Assets/Scripts/UI/Overlay/OverlayDescriptor.cs b/Assets/Scripts/UI/Overlay/OverlayDescriptor.cs index 46ebc42d4..d2e296abb 100644 --- a/Assets/Scripts/UI/Overlay/OverlayDescriptor.cs +++ b/Assets/Scripts/UI/Overlay/OverlayDescriptor.cs @@ -94,7 +94,7 @@ public void ReadXmlPrototype(XmlReader xmlReader) } catch (ArgumentException e) { - Debug.ULogErrorChannel("OverlayMap", "Invalid color map!", e); + UnityDebugger.Debugger.LogErrorFormat("OverlayMap", "Invalid color map!\n{0}", e.Message); } } diff --git a/Assets/Scripts/UI/Overlay/OverlayMap.cs b/Assets/Scripts/UI/Overlay/OverlayMap.cs index b691bd784..fa8966d6e 100644 --- a/Assets/Scripts/UI/Overlay/OverlayMap.cs +++ b/Assets/Scripts/UI/Overlay/OverlayMap.cs @@ -258,7 +258,7 @@ public void SetOverlay(string name) if (FunctionsManager.Overlay.HasFunction(descr.LuaFunctionName) == false) { - Debug.ULogErrorChannel("OverlayMap", string.Format("Couldn't find a function named '{0}' in '{1}'", descr.LuaFunctionName)); + UnityDebugger.Debugger.LogError("OverlayMap", string.Format("Couldn't find a function named '{0}' in '{1}'", descr.LuaFunctionName)); return; } @@ -277,7 +277,7 @@ public void SetOverlay(string name) { if (loggedOnce == false) { - Debug.ULogErrorChannel("OverlayMap", string.Format("The return value from the function named '{0}' was null for tile at ({1}, {2}, {3})", descr.LuaFunctionName, x, y, z)); + UnityDebugger.Debugger.LogError("OverlayMap", string.Format("The return value from the function named '{0}' was null for tile at ({1}, {2}, {3})", descr.LuaFunctionName, x, y, z)); loggedOnce = true; } @@ -293,7 +293,7 @@ public void SetOverlay(string name) } else { - Debug.ULogWarningChannel("OverlayMap", string.Format("Overlay with name {0} not found in prototypes", name)); + UnityDebugger.Debugger.LogWarning("OverlayMap", string.Format("Overlay with name {0} not found in prototypes", name)); } } @@ -378,7 +378,7 @@ private void Init() meshRenderer.material = mat; if (mat == null || meshRenderer == null) { - Debug.ULogErrorChannel("OverlayMap", "Material or renderer is null. Failing."); + UnityDebugger.Debugger.LogError("OverlayMap", "Material or renderer is null. Failing."); } initialized = true; @@ -430,7 +430,7 @@ private void GenerateTexture() { if (colorMapTexture == null) { - Debug.ULogErrorChannel("OverlayMap", "No color map texture setted!"); + UnityDebugger.Debugger.LogError("OverlayMap", "No color map texture setted!"); } if (!overlayColorMapLookup.ContainsKey(currentOverlay)) @@ -534,7 +534,7 @@ private void CreateGUI() UnityEngine.UI.Dropdown dropdown = parentPanel.GetComponentInChildren(); if (dropdown == null) { - Debug.ULogWarningChannel("OverlayMap", "No parent panel was selected!"); + UnityDebugger.Debugger.LogWarning("OverlayMap", "No parent panel was selected!"); return; } diff --git a/Assets/Scripts/Utilities/ModUtils.cs b/Assets/Scripts/Utilities/ModUtils.cs index 44254d899..9243ca0fb 100644 --- a/Assets/Scripts/Utilities/ModUtils.cs +++ b/Assets/Scripts/Utilities/ModUtils.cs @@ -64,32 +64,32 @@ public static void LogError(object obj) public static void ULogChannel(string channel, string message) { - Debug.ULogChannel(channel, message); + UnityDebugger.Debugger.Log(channel, message); } public static void ULogWarningChannel(string channel, string message) { - Debug.ULogWarningChannel(channel, message); + UnityDebugger.Debugger.LogWarning(channel, message); } public static void ULogErrorChannel(string channel, string message) { - Debug.ULogErrorChannel(channel, message); + UnityDebugger.Debugger.LogError(channel, message); } public static void ULog(string message) { - Debug.ULogChannel(defaultLogChannel, message); + UnityDebugger.Debugger.Log(defaultLogChannel, message); } public static void ULogWarning(string message) { - Debug.ULogWarningChannel(defaultLogChannel, message); + UnityDebugger.Debugger.LogWarning(defaultLogChannel, message); } public static void ULogError(string message) { - Debug.ULogErrorChannel(defaultLogChannel, message); + UnityDebugger.Debugger.LogError(defaultLogChannel, message); } public static float Clamp(float value, float min, float max) diff --git a/Assets/UberLogger.meta b/Assets/UberLogger.meta deleted file mode 100644 index 60cbf91f9..000000000 --- a/Assets/UberLogger.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 36e49051ba9ea364b91d6968ace42c92 -folderAsset: yes -timeCreated: 1471896262 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art.meta b/Assets/UberLogger/Art.meta deleted file mode 100644 index 9b8123b76..000000000 --- a/Assets/UberLogger/Art.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 08b646709d2a14c419ef4e641ce44797 -folderAsset: yes -timeCreated: 1437657322 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/Button.png b/Assets/UberLogger/Art/Button.png deleted file mode 100644 index 138bac3a3..000000000 Binary files a/Assets/UberLogger/Art/Button.png and /dev/null differ diff --git a/Assets/UberLogger/Art/Button.png.meta b/Assets/UberLogger/Art/Button.png.meta deleted file mode 100644 index dc863ca54..000000000 --- a/Assets/UberLogger/Art/Button.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 2ae9477f7f0774b808aef406d3bf2d3c -timeCreated: 1437687420 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/ButtonError.png b/Assets/UberLogger/Art/ButtonError.png deleted file mode 100644 index 9fcc2146a..000000000 Binary files a/Assets/UberLogger/Art/ButtonError.png and /dev/null differ diff --git a/Assets/UberLogger/Art/ButtonError.png.meta b/Assets/UberLogger/Art/ButtonError.png.meta deleted file mode 100644 index c6b9cf6eb..000000000 --- a/Assets/UberLogger/Art/ButtonError.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: f752d027f2368431c924c0306e747c4b -timeCreated: 1437728159 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/ErrorIcon.png b/Assets/UberLogger/Art/ErrorIcon.png deleted file mode 100644 index 1af20cc91..000000000 Binary files a/Assets/UberLogger/Art/ErrorIcon.png and /dev/null differ diff --git a/Assets/UberLogger/Art/ErrorIcon.png.meta b/Assets/UberLogger/Art/ErrorIcon.png.meta deleted file mode 100644 index b4b604c41..000000000 --- a/Assets/UberLogger/Art/ErrorIcon.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: f5e296e323cd64d619488c517c4692af -timeCreated: 1437663587 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/LogLine1.png b/Assets/UberLogger/Art/LogLine1.png deleted file mode 100644 index d456d99c8..000000000 Binary files a/Assets/UberLogger/Art/LogLine1.png and /dev/null differ diff --git a/Assets/UberLogger/Art/LogLine1.png.meta b/Assets/UberLogger/Art/LogLine1.png.meta deleted file mode 100644 index 46c2a163e..000000000 --- a/Assets/UberLogger/Art/LogLine1.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 58be81cf6eccb4cabbae417792fd2765 -timeCreated: 1437660139 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/LogLine2.png b/Assets/UberLogger/Art/LogLine2.png deleted file mode 100644 index 3dd4b752b..000000000 Binary files a/Assets/UberLogger/Art/LogLine2.png and /dev/null differ diff --git a/Assets/UberLogger/Art/LogLine2.png.meta b/Assets/UberLogger/Art/LogLine2.png.meta deleted file mode 100644 index ca8f95d5a..000000000 --- a/Assets/UberLogger/Art/LogLine2.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 33bd69e44bf8341e5a10577910796fb6 -timeCreated: 1437660139 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/LogLineSelected.png b/Assets/UberLogger/Art/LogLineSelected.png deleted file mode 100644 index 1cf494240..000000000 Binary files a/Assets/UberLogger/Art/LogLineSelected.png and /dev/null differ diff --git a/Assets/UberLogger/Art/LogLineSelected.png.meta b/Assets/UberLogger/Art/LogLineSelected.png.meta deleted file mode 100644 index 5fbdcb2b6..000000000 --- a/Assets/UberLogger/Art/LogLineSelected.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: c60b5ba991951418b86ce94a4b97321c -timeCreated: 1437660139 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/MessageIcon.png b/Assets/UberLogger/Art/MessageIcon.png deleted file mode 100644 index 46d19f8ac..000000000 Binary files a/Assets/UberLogger/Art/MessageIcon.png and /dev/null differ diff --git a/Assets/UberLogger/Art/MessageIcon.png.meta b/Assets/UberLogger/Art/MessageIcon.png.meta deleted file mode 100644 index 4069e255d..000000000 --- a/Assets/UberLogger/Art/MessageIcon.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: fa976bac27b1e440eb0d8bd71c1caac3 -timeCreated: 1437663836 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/ToolbarButton.png b/Assets/UberLogger/Art/ToolbarButton.png deleted file mode 100644 index b368a5d65..000000000 Binary files a/Assets/UberLogger/Art/ToolbarButton.png and /dev/null differ diff --git a/Assets/UberLogger/Art/ToolbarButton.png.meta b/Assets/UberLogger/Art/ToolbarButton.png.meta deleted file mode 100644 index f91b871c3..000000000 --- a/Assets/UberLogger/Art/ToolbarButton.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 1e3d00b6e3a884febbfd0da496905572 -timeCreated: 1437660139 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/ToolbarButtonClicked.png b/Assets/UberLogger/Art/ToolbarButtonClicked.png deleted file mode 100644 index b9fc1fa8f..000000000 Binary files a/Assets/UberLogger/Art/ToolbarButtonClicked.png and /dev/null differ diff --git a/Assets/UberLogger/Art/ToolbarButtonClicked.png.meta b/Assets/UberLogger/Art/ToolbarButtonClicked.png.meta deleted file mode 100644 index e802694ec..000000000 --- a/Assets/UberLogger/Art/ToolbarButtonClicked.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: c445efe53c41a452897859c5e65dde5c -timeCreated: 1437662129 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/ToolbarButtonDown.png b/Assets/UberLogger/Art/ToolbarButtonDown.png deleted file mode 100644 index 0c463ab22..000000000 Binary files a/Assets/UberLogger/Art/ToolbarButtonDown.png and /dev/null differ diff --git a/Assets/UberLogger/Art/ToolbarButtonDown.png.meta b/Assets/UberLogger/Art/ToolbarButtonDown.png.meta deleted file mode 100644 index da5095721..000000000 --- a/Assets/UberLogger/Art/ToolbarButtonDown.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: bd719bdc497244113bf9f08779f78082 -timeCreated: 1437664533 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/UberConsoleSkin.guiskin b/Assets/UberLogger/Art/UberConsoleSkin.guiskin deleted file mode 100644 index 9d6958b97..000000000 --- a/Assets/UberLogger/Art/UberConsoleSkin.guiskin +++ /dev/null @@ -1,1433 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 1 - m_Script: {fileID: 12001, guid: 0000000000000000e000000000000000, type: 0} - m_Name: UberConsoleSkin - m_EditorClassIdentifier: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_box: - m_Name: box - m_Normal: - m_Background: {fileID: 0} - m_TextColor: {r: .799999952, g: .799999952, b: .799999952, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 6 - m_Right: 6 - m_Top: 6 - m_Bottom: 6 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 1 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_button: - m_Name: button - m_Normal: - m_Background: {fileID: 11006, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .899999976, g: .899999976, b: .899999976, a: 1} - m_Hover: - m_Background: {fileID: 11003, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Active: - m_Background: {fileID: 11002, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .899999976, g: .899999976, b: .899999976, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnNormal: - m_Background: {fileID: 11005, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .90196079, g: .90196079, b: .90196079, a: 1} - m_OnHover: - m_Background: {fileID: 11004, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnActive: - m_Background: {fileID: 11002, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .899999976, g: .899999976, b: .899999976, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 6 - m_Right: 6 - m_Top: 6 - m_Bottom: 4 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 6 - m_Right: 6 - m_Top: 3 - m_Bottom: 3 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 4 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_toggle: - m_Name: toggle - m_Normal: - m_Background: {fileID: 11018, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .891128957, g: .891128957, b: .891128957, a: 1} - m_Hover: - m_Background: {fileID: 11014, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Active: - m_Background: {fileID: 11013, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 11016, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .890196085, g: .890196085, b: .890196085, a: 1} - m_OnHover: - m_Background: {fileID: 11015, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnActive: - m_Background: {fileID: 11017, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 14 - m_Right: 0 - m_Top: 14 - m_Bottom: 0 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 15 - m_Right: 0 - m_Top: 3 - m_Bottom: 0 - m_Overflow: - m_Left: -1 - m_Right: 0 - m_Top: -4 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_label: - m_Name: label - m_Normal: - m_Background: {fileID: 0} - m_TextColor: {r: .899999976, g: .899999976, b: .899999976, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 3 - m_Bottom: 3 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 1 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_textField: - m_Name: textfield - m_Normal: - m_Background: {fileID: 11024, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .799999952, g: .799999952, b: .799999952, a: 1} - m_Hover: - m_Background: {fileID: 11026, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .899999976, g: .899999976, b: .899999976, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 11026, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnNormal: - m_Background: {fileID: 11025, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 3 - m_Right: 3 - m_Top: 3 - m_Bottom: 3 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 0 - m_TextClipping: 1 - m_ImagePosition: 3 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_textArea: - m_Name: textarea - m_Normal: - m_Background: {fileID: 11024, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .90196079, g: .90196079, b: .90196079, a: 1} - m_Hover: - m_Background: {fileID: 11026, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: .799999952, g: .799999952, b: .799999952, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 11025, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 3 - m_Right: 3 - m_Top: 3 - m_Bottom: 3 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 1 - m_RichText: 0 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_window: - m_Name: window - m_Normal: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Hover: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Active: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Focused: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnNormal: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnHover: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnActive: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnFocused: - m_Background: {fileID: 2800000, guid: e4083732964464539b3e141a263f50b6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Border: - m_Left: 10 - m_Right: 9 - m_Top: 19 - m_Bottom: 9 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 10 - m_Right: 10 - m_Top: 20 - m_Bottom: 10 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 1 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: -18} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_horizontalSlider: - m_Name: horizontalslider - m_Normal: - m_Background: {fileID: 11009, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 3 - m_Right: 3 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: -1 - m_Right: -1 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: -2 - m_Bottom: -3 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 2 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 12 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_horizontalSliderThumb: - m_Name: horizontalsliderthumb - m_Normal: - m_Background: {fileID: 11011, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 11012, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 11010, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 4 - m_Right: 4 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 7 - m_Right: 7 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: -1 - m_Right: -1 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 2 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 12 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_verticalSlider: - m_Name: verticalslider - m_Normal: - m_Background: {fileID: 11021, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 3 - m_Bottom: 3 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: -1 - m_Bottom: -1 - m_Overflow: - m_Left: -2 - m_Right: -3 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 0 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 12 - m_FixedHeight: 0 - m_StretchWidth: 0 - m_StretchHeight: 1 - m_verticalSliderThumb: - m_Name: verticalsliderthumb - m_Normal: - m_Background: {fileID: 11011, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 11012, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 11010, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 7 - m_Bottom: 7 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: -1 - m_Bottom: -1 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 12 - m_FixedHeight: 0 - m_StretchWidth: 0 - m_StretchHeight: 1 - m_horizontalScrollbar: - m_Name: horizontalscrollbar - m_Normal: - m_Background: {fileID: 11008, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 9 - m_Right: 9 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 4 - m_Right: 4 - m_Top: 1 - m_Bottom: 4 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 2 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 15 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_horizontalScrollbarThumb: - m_Name: horizontalscrollbarthumb - m_Normal: - m_Background: {fileID: 11007, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 6 - m_Right: 6 - m_Top: 6 - m_Bottom: 6 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 6 - m_Right: 6 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: -1 - m_Bottom: 1 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 13 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_horizontalScrollbarLeftButton: - m_Name: horizontalscrollbarleftbutton - m_Normal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_horizontalScrollbarRightButton: - m_Name: horizontalscrollbarrightbutton - m_Normal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_verticalScrollbar: - m_Name: verticalscrollbar - m_Normal: - m_Background: {fileID: 11020, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 9 - m_Bottom: 9 - m_Margin: - m_Left: 1 - m_Right: 4 - m_Top: 4 - m_Bottom: 4 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 1 - m_Bottom: 1 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 15 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_verticalScrollbarThumb: - m_Name: verticalscrollbarthumb - m_Normal: - m_Background: {fileID: 11019, guid: 0000000000000000e000000000000000, type: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 6 - m_Right: 6 - m_Top: 6 - m_Bottom: 6 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 6 - m_Bottom: 6 - m_Overflow: - m_Left: -1 - m_Right: -1 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 2 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 15 - m_FixedHeight: 0 - m_StretchWidth: 0 - m_StretchHeight: 1 - m_verticalScrollbarUpButton: - m_Name: verticalscrollbarupbutton - m_Normal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_verticalScrollbarDownButton: - m_Name: verticalscrollbardownbutton - m_Normal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_ScrollView: - m_Name: scrollview - m_Normal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Hover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Active: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Focused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 1 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_CustomStyles: - - m_Name: LogLine1 - m_Normal: - m_Background: {fileID: 2800000, guid: 58be81cf6eccb4cabbae417792fd2765, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Hover: - m_Background: {fileID: 2800000, guid: 58be81cf6eccb4cabbae417792fd2765, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Active: - m_Background: {fileID: 2800000, guid: 58be81cf6eccb4cabbae417792fd2765, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Focused: - m_Background: {fileID: 2800000, guid: 58be81cf6eccb4cabbae417792fd2765, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 0 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - - m_Name: LogLine2 - m_Normal: - m_Background: {fileID: 2800000, guid: 33bd69e44bf8341e5a10577910796fb6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Hover: - m_Background: {fileID: 2800000, guid: 33bd69e44bf8341e5a10577910796fb6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Active: - m_Background: {fileID: 2800000, guid: 33bd69e44bf8341e5a10577910796fb6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Focused: - m_Background: {fileID: 2800000, guid: 33bd69e44bf8341e5a10577910796fb6, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 0 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - - m_Name: SelectedLogLine - m_Normal: - m_Background: {fileID: 2800000, guid: c60b5ba991951418b86ce94a4b97321c, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Hover: - m_Background: {fileID: 2800000, guid: c60b5ba991951418b86ce94a4b97321c, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Active: - m_Background: {fileID: 2800000, guid: c60b5ba991951418b86ce94a4b97321c, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Focused: - m_Background: {fileID: 2800000, guid: c60b5ba991951418b86ce94a4b97321c, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnNormal: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnActive: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_OnFocused: - m_Background: {fileID: 0} - m_TextColor: {r: 0, g: 0, b: 0, a: 1} - m_Border: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 0 - m_FontStyle: 0 - m_Alignment: 0 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 0 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - - m_Name: ToolbarButton - m_Normal: - m_Background: {fileID: 2800000, guid: 1e3d00b6e3a884febbfd0da496905572, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Hover: - m_Background: {fileID: 2800000, guid: 1e3d00b6e3a884febbfd0da496905572, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Active: - m_Background: {fileID: 2800000, guid: c445efe53c41a452897859c5e65dde5c, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Focused: - m_Background: {fileID: 2800000, guid: 1e3d00b6e3a884febbfd0da496905572, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnNormal: - m_Background: {fileID: 2800000, guid: bd719bdc497244113bf9f08779f78082, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnHover: - m_Background: {fileID: 0} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnActive: - m_Background: {fileID: 2800000, guid: c445efe53c41a452897859c5e65dde5c, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_OnFocused: - m_Background: {fileID: 2800000, guid: c60b5ba991951418b86ce94a4b97321c, type: 3} - m_TextColor: {r: 1, g: 1, b: 1, a: 1} - m_Border: - m_Left: 1 - m_Right: 1 - m_Top: 0 - m_Bottom: 0 - m_Margin: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Padding: - m_Left: 3 - m_Right: 3 - m_Top: 3 - m_Bottom: 3 - m_Overflow: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_Font: {fileID: 0} - m_FontSize: 10 - m_FontStyle: 0 - m_Alignment: 4 - m_WordWrap: 0 - m_RichText: 1 - m_TextClipping: 0 - m_ImagePosition: 0 - m_ContentOffset: {x: 0, y: 0} - m_FixedWidth: 0 - m_FixedHeight: 0 - m_StretchWidth: 1 - m_StretchHeight: 0 - m_Settings: - m_DoubleClickSelectsWord: 1 - m_TripleClickSelectsLine: 1 - m_CursorColor: {r: 1, g: 1, b: 1, a: 1} - m_CursorFlashSpeed: -1 - m_SelectionColor: {r: 1, g: .384039074, b: 0, a: .699999988} diff --git a/Assets/UberLogger/Art/UberConsoleSkin.guiskin.meta b/Assets/UberLogger/Art/UberConsoleSkin.guiskin.meta deleted file mode 100644 index 40240aec8..000000000 --- a/Assets/UberLogger/Art/UberConsoleSkin.guiskin.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7018997e7c4ba41d8aa5a2338b82d57f -timeCreated: 1437656589 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/WarningIcon.png b/Assets/UberLogger/Art/WarningIcon.png deleted file mode 100644 index 0ad9537f3..000000000 Binary files a/Assets/UberLogger/Art/WarningIcon.png and /dev/null differ diff --git a/Assets/UberLogger/Art/WarningIcon.png.meta b/Assets/UberLogger/Art/WarningIcon.png.meta deleted file mode 100644 index 9762f65f5..000000000 --- a/Assets/UberLogger/Art/WarningIcon.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: ecc8f3c040a254019afd50c8bc285b48 -timeCreated: 1437663836 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - linearTexture: 1 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: 1 - mipBias: -1 - wrapMode: 1 - nPOTScale: 0 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 1 - textureType: 2 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/WhiteTexture.png b/Assets/UberLogger/Art/WhiteTexture.png deleted file mode 100644 index 84f7a959f..000000000 Binary files a/Assets/UberLogger/Art/WhiteTexture.png and /dev/null differ diff --git a/Assets/UberLogger/Art/WhiteTexture.png.meta b/Assets/UberLogger/Art/WhiteTexture.png.meta deleted file mode 100644 index 7553eee17..000000000 --- a/Assets/UberLogger/Art/WhiteTexture.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 1133c84ccb4d141f1b48c8c137f4b4ea -timeCreated: 1437657427 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Art/WindowTexture.png b/Assets/UberLogger/Art/WindowTexture.png deleted file mode 100644 index cd1240457..000000000 Binary files a/Assets/UberLogger/Art/WindowTexture.png and /dev/null differ diff --git a/Assets/UberLogger/Art/WindowTexture.png.meta b/Assets/UberLogger/Art/WindowTexture.png.meta deleted file mode 100644 index a6788dd73..000000000 --- a/Assets/UberLogger/Art/WindowTexture.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: e4083732964464539b3e141a263f50b6 -timeCreated: 1437658895 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Debug.cs b/Assets/UberLogger/Debug.cs deleted file mode 100644 index bf2594323..000000000 --- a/Assets/UberLogger/Debug.cs +++ /dev/null @@ -1,360 +0,0 @@ -// -using UnityEngine; -using UberLogger; - -public static class Debug -{ - /// - /// Enable/Disable log. - /// - public static bool IsLogEnabled { get; set; } - - static Debug() - { - IsLogEnabled = true; - } - - //Unity replacement methods - public static void DrawRay(Vector3 start, Vector3 dir, Color? color=null, float duration = 0.0f, bool depthTest = true) - { - if (IsLogEnabled == false) - { - return; - } - - var col = color ?? Color.white; - UnityEngine.Debug.DrawRay(start, dir, col, duration, depthTest); - } - - public static void DrawLine(Vector3 start, Vector3 end, Color? color=null, float duration = 0.0f, bool depthTest = true) - { - if (IsLogEnabled == false) - { - return; - } - - var col = color ?? Color.white; - UnityEngine.Debug.DrawLine(start, end, col, duration, depthTest); - } - - public static void Break() - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.Break(); - } - -#if UNITY_5 - public static void Assert(bool condition) - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.Assert(condition); - } - - public static void Assert(bool condition, string message) - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.Assert(condition, message); - } - - public static void Assert(bool condition, string format, params object[] args) - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.AssertFormat(condition, format, args); - } - - public static void ClearDeveloperConsole() - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.ClearDeveloperConsole(); - } -#endif - - [StackTraceIgnore] - public static void LogFormat(UnityEngine.Object context, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Message, message, par); - } - - [StackTraceIgnore] - public static void LogFormat(string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", null, LogSeverity.Message, message, par); - } - - [StackTraceIgnore] - public static void Log(object message, UnityEngine.Object context = null) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Message, message); - } - - [StackTraceIgnore] - public static void LogErrorFormat(UnityEngine.Object context, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Error, message, par); - } - - [StackTraceIgnore] - public static void LogErrorFormat(string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", null, LogSeverity.Error, message, par); - } - - [StackTraceIgnore] - public static void LogError(object message, UnityEngine.Object context = null) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Error, message); - } - - [StackTraceIgnore] - public static void LogWarningFormat(UnityEngine.Object context, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void LogWarningFormat(string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", null, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void LogWarning(object message, UnityEngine.Object context = null) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Warning, message); - } - - // New methods - [StackTraceIgnore] - public static void ULog(UnityEngine.Object context, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void ULog(string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", null, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void ULogChannel(UnityEngine.Object context, string channel, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log(channel, context, LogSeverity.Message, message, par); - } - - [StackTraceIgnore] - public static void ULogChannel(string channel, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log(channel, null, LogSeverity.Message, message, par); - } - - - [StackTraceIgnore] - public static void ULogWarning(UnityEngine.Object context, object message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void ULogWarning(object message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", null, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void ULogWarningChannel(UnityEngine.Object context, string channel, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log(channel, context, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void ULogWarningChannel(string channel, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log(channel, null, LogSeverity.Warning, message, par); - } - - [StackTraceIgnore] - public static void ULogError(UnityEngine.Object context, object message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", context, LogSeverity.Error, message, par); - } - - [StackTraceIgnore] - public static void ULogError(object message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log("", null, LogSeverity.Error, message, par); - } - - [StackTraceIgnore] - public static void ULogErrorChannel(UnityEngine.Object context, string channel, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log(channel, context, LogSeverity.Error, message, par); - } - - [StackTraceIgnore] - public static void ULogErrorChannel(string channel, string message, params object[] par) - { - if (IsLogEnabled == false) - { - return; - } - - UberLogger.Logger.Log(channel, null, LogSeverity.Error, message, par); - } - - - //Logs that will not be caught by UberLogger - //Useful for debugging UberLogger - [LogUnityOnly] - public static void UnityLog(object message) - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.Log(message); - } - - [LogUnityOnly] - public static void UnityLogWarning(object message) - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.LogWarning(message); - } - - [LogUnityOnly] - public static void UnityLogError(object message) - { - if (IsLogEnabled == false) - { - return; - } - - UnityEngine.Debug.LogError(message); - } -} diff --git a/Assets/UberLogger/Debug.cs.meta b/Assets/UberLogger/Debug.cs.meta deleted file mode 100644 index 57b13df8d..000000000 --- a/Assets/UberLogger/Debug.cs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 78e53ab1366804822b3fa81f9ea350f7 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: diff --git a/Assets/UberLogger/Editor.meta b/Assets/UberLogger/Editor.meta deleted file mode 100644 index 3d1578f12..000000000 --- a/Assets/UberLogger/Editor.meta +++ /dev/null @@ -1,6 +0,0 @@ -fileFormatVersion: 2 -guid: 924e28e7ff79f47cfa66acf89387353d -folderAsset: yes -DefaultImporter: - userData: - assetBundleName: diff --git a/Assets/UberLogger/Editor/UberLoggerEditorWindow.cs b/Assets/UberLogger/Editor/UberLoggerEditorWindow.cs deleted file mode 100644 index cf2c72329..000000000 --- a/Assets/UberLogger/Editor/UberLoggerEditorWindow.cs +++ /dev/null @@ -1,599 +0,0 @@ -// -using UnityEngine; -using UnityEditor; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System; -using UberLogger; - -/// -/// The console logging frontend. -/// Pulls data from the UberLoggerEditor backend -/// - -public class UberLoggerEditorWindow : EditorWindow -{ - //Settings - float logDetailsWindowHeight = 100; // Customise details window size - int pushStep = 50; - int lastItemsCount = 0; - - [MenuItem("Window/Show Uber Console")] - static public void ShowLogWindow() - { - Init(); - } - - static public void Init() - { - var window = ScriptableObject.CreateInstance(); - window.Show(); - window.position = new Rect(200,200,400,300); - window.CurrentTopPaneHeight = window.position.height/2; - } - - void OnEnable() - { - // Connect to or create the backend - if(!EditorLogger) - { - EditorLogger = UberLogger.Logger.GetLogger(); - if(!EditorLogger) - { - EditorLogger = UberLoggerEditor.Create(); - } - } - - // UberLogger doesn't allow for duplicate loggers, so this is safe - // And, due to Unity serialisation stuff, necessary to do to it here. - UberLogger.Logger.AddLogger(EditorLogger); - -#if UNITY_5 - titleContent.text = "Uber Console"; -#else - title = "Uber Console"; - -#endif - - ClearSelectedMessage(); - - SmallErrorIcon = EditorGUIUtility.FindTexture( "d_console.erroricon.sml" ) ; - SmallWarningIcon = EditorGUIUtility.FindTexture( "d_console.warnicon.sml" ) ; - SmallMessageIcon = EditorGUIUtility.FindTexture( "d_console.infoicon.sml" ) ; - ErrorIcon = SmallErrorIcon; - WarningIcon = SmallWarningIcon; - MessageIcon = SmallMessageIcon; - } - - public void OnGUI() - { - //Set up the basic style, based on the Unity defaults - //A bit hacky, but means we don't have to ship an editor guistyle and can fit in to pro and free skins - Color defaultLineColor = GUI.backgroundColor; - - foreach(var style in GUI.skin.customStyles) - { - if(style.name=="LODSliderRangeSelected") - { - SelectedLogLineStyle = new GUIStyle(EditorStyles.label); - LogLineStyle = new GUIStyle(EditorStyles.label); - SelectedLogLineStyle.margin = new RectOffset(0, 0, 0,0 ); - SelectedLogLineStyle.normal.background = style.normal.background; - SelectedLogLineStyle.active = SelectedLogLineStyle.normal; - SelectedLogLineStyle.hover = SelectedLogLineStyle.normal; - SelectedLogLineStyle.focused = SelectedLogLineStyle.normal; - - LogLineStyle.margin = new RectOffset(0, 0, 0,0 ); - LogLineStyle.normal.background = EditorGUIUtility.whiteTexture; - LogLineStyle.active = LogLineStyle.normal; - LogLineStyle.hover = LogLineStyle.normal; - LogLineStyle.focused = LogLineStyle.normal; - break; - } - } - - LineColour1 = defaultLineColor; - LineColour2 = new Color(defaultLineColor.r*0.9f, defaultLineColor.g*0.9f, defaultLineColor.b*0.9f); - SizerLineColour = new Color(defaultLineColor.r*0.5f, defaultLineColor.g*0.5f, defaultLineColor.b*0.5f); - - GUILayout.BeginVertical(GUILayout.Height(CurrentTopPaneHeight), GUILayout.MinHeight(100)); - DrawToolbar(); - DrawFilter(); - DrawChannels(); - DrawLogList(); - GUILayout.EndVertical(); - ResizeTopPane(); - - //Create a small gap so the resize handle isn't overwritten - GUILayout.Space(10); - GUILayout.BeginVertical(GUILayout.MaxHeight(logDetailsWindowHeight)); - DrawLogDetails(); - GUILayout.EndVertical(); - - //Force a repaint, since we're constantly resizing/adding stuff to the window - //Potential optimisation here is to only repaint if the window is resized or we have new logs - Repaint(); - } - - //Some helper functions to draw buttons that are only as big as their text - bool ButtonClamped(string text, GUIStyle style) - { - return GUILayout.Button(text, style, GUILayout.MaxWidth(style.CalcSize(new GUIContent(text)).x)); - } - - bool ToggleClamped(bool state, string text, GUIStyle style) - { - return GUILayout.Toggle(state, text, style, GUILayout.MaxWidth(style.CalcSize(new GUIContent(text)).x)); - } - - bool ToggleClamped(bool state, GUIContent content, GUIStyle style, params GUILayoutOption[] par) - { - return GUILayout.Toggle(state, content, style, GUILayout.MaxWidth(style.CalcSize(content).x)); - } - - void LabelClamped(string text, GUIStyle style) - { - GUILayout.Label(text, style, GUILayout.MaxWidth(style.CalcSize(new GUIContent(text)).x)); - } - - /// - /// Draws the thin, Unity-style toolbar showing error counts and toggle buttons - /// - void DrawToolbar() - { - EditorGUILayout.BeginHorizontal(); - if(ButtonClamped("Clear", EditorStyles.toolbarButton)) - { - EditorLogger.Clear(); - } - EditorLogger.ClearOnPlay = ToggleClamped(EditorLogger.ClearOnPlay, "Clear On Play", EditorStyles.toolbarButton); - EditorLogger.PauseOnError = ToggleClamped(EditorLogger.PauseOnError, "Pause On Error", EditorStyles.toolbarButton); - ShowTimes = ToggleClamped(ShowTimes, "Show Times", EditorStyles.toolbarButton); - - var buttonSize = EditorStyles.toolbarButton.CalcSize(new GUIContent("T")).y; - GUILayout.FlexibleSpace(); - - var showErrors = ToggleClamped(ShowErrors, new GUIContent(EditorLogger.NoErrors.ToString(), SmallErrorIcon), EditorStyles.toolbarButton, GUILayout.Height(buttonSize)); - var showWarnings = ToggleClamped(ShowWarnings, new GUIContent(EditorLogger.NoWarnings.ToString(), SmallWarningIcon), EditorStyles.toolbarButton, GUILayout.Height(buttonSize)); - var showMessages = ToggleClamped(ShowMessages, new GUIContent(EditorLogger.NoMessages.ToString(), SmallMessageIcon), EditorStyles.toolbarButton, GUILayout.Height(buttonSize)); - //If the errors/warning to show has changed, clear the selected message - if(showErrors!=ShowErrors || showWarnings!=ShowWarnings || showMessages!=ShowMessages) - { - ClearSelectedMessage(); - } - ShowWarnings = showWarnings; - ShowMessages = showMessages; - ShowErrors = showErrors; - EditorGUILayout.EndHorizontal(); - } - - /// - /// Draws the channel selector - /// - void DrawChannels() - { - var channels = GetChannels(); - int currentChannelIndex = 0; - for(int c1=0; c1 - /// Based on filter and channel selections, should this log be shown? - /// - bool ShouldShowLog(System.Text.RegularExpressions.Regex regex, LogInfo log) - { - if(log.Channel==CurrentChannel || CurrentChannel=="All" || (CurrentChannel=="No Channel" && String.IsNullOrEmpty(log.Channel))) - { - if((log.Severity==LogSeverity.Message && ShowMessages) - || (log.Severity==LogSeverity.Warning && ShowWarnings) - || (log.Severity==LogSeverity.Error && ShowErrors)) - { - if(regex==null || regex.IsMatch(log.Message)) - { - return true; - } - } - } - - return false; - } - - /// - /// Draws the main log panel - /// - public void DrawLogList() - { - var oldColor = GUI.backgroundColor; - - LogListScrollPosition = EditorGUILayout.BeginScrollView(LogListScrollPosition); - var maxLogPanelHeight = position.height; - - float buttonY = 0; - float buttonHeight = LogLineStyle.CalcSize(new GUIContent("Test")).y; - - System.Text.RegularExpressions.Regex filterRegex = null; - - if(!String.IsNullOrEmpty(FilterRegex)) - { - filterRegex = new System.Text.RegularExpressions.Regex(FilterRegex); - } - - int drawnButtons = 0; - var logLineStyle = new GUIStyle(LogLineStyle); - for(int c1=0; c1LogListScrollPosition.y && buttonY0) - { - JumpToSource(log.Callstack[0]); - } - } - else - { - LastMessageClickTime = EditorApplication.timeSinceStartup; - } - } - else - { - SelectedMessage = c1; - SelectedCallstackFrame = -1; - } - - //Always select the game object that is the source of this message - var go = log.Source as GameObject; - if(go!=null) - { - Selection.activeGameObject = go; - } - - } - } - else - { - GUILayout.Space(buttonHeight); - } - buttonY += buttonHeight; - if (lastItemsCount != EditorLogger.LogInfo.Count) - { - LogListScrollPosition.y += pushStep; - lastItemsCount = EditorLogger.LogInfo.Count; - } - } - } - EditorGUILayout.EndScrollView(); - GUI.backgroundColor = oldColor; - } - - - /// - /// The bottom of the panel - details of the selected log - /// - public void DrawLogDetails() - { - var oldColor = GUI.backgroundColor; - SelectedMessage = Mathf.Clamp(SelectedMessage, 0, EditorLogger.LogInfo.Count); - if(EditorLogger.LogInfo.Count>0 && SelectedMessage>=0) - { - LogDetailsScrollPosition = EditorGUILayout.BeginScrollView(LogDetailsScrollPosition); - var log = EditorLogger.LogInfo[SelectedMessage]; - var logLineStyle = LogLineStyle; - for(int c1=0; c1 GetChannels() - { - var categories = EditorLogger.Channels; - - var channelList = new List(); - channelList.Add("All"); - channelList.Add("No Channel"); - channelList.AddRange(categories); - return channelList; - } - - /// - /// Handles the split window stuff, somewhat bodgily - /// - private void ResizeTopPane() - { - //Set up the resize collision rect - CursorChangeRect = new Rect(0, CurrentTopPaneHeight, position.width, 5f); - - var oldColor = GUI.color; - GUI.color = SizerLineColour; - GUI.DrawTexture(CursorChangeRect,EditorGUIUtility.whiteTexture); - GUI.color = oldColor; - EditorGUIUtility.AddCursorRect(CursorChangeRect,UnityEditor.MouseCursor.ResizeVertical); - - if( Event.current.type == EventType.mouseDown && CursorChangeRect.Contains(Event.current.mousePosition)) - { - Resize = true; - } - - if(Resize) - { - CurrentTopPaneHeight = Event.current.mousePosition.y; - CursorChangeRect.Set(CursorChangeRect.x,CurrentTopPaneHeight,CursorChangeRect.width,CursorChangeRect.height); - } - - if(Event.current.type == EventType.MouseUp) - Resize = false; - - CurrentTopPaneHeight = Mathf.Clamp(CurrentTopPaneHeight, 100, position.height-100); - } - - //Cache for GetSourceForFrame - string SourceLines; - LogStackFrame SourceLinesFrame; - - /// - ///If the frame has a valid filename, get the source string for the code around the frame - ///This is cached, so we don't keep getting it. - /// - string GetSourceForFrame(LogStackFrame frame) - { - if(SourceLinesFrame==frame) - { - return SourceLines; - } - - - if(frame.FileName==null) - { - return ""; - } - var filename = System.IO.Path.Combine(System.IO.Directory.GetCurrentDirectory(), frame.FileName); - if (!System.IO.File.Exists(filename)) - { - return ""; - } - - int lineNumber = frame.LineNumber-1; - int linesAround = 3; - var lines = System.IO.File.ReadAllLines(filename); - var firstLine = Mathf.Max(lineNumber-linesAround, 0); - var lastLine = Mathf.Min(lineNumber+linesAround+1, lines.Count()); - - SourceLines = ""; - if(firstLine!=0) - { - SourceLines += "...\n"; - } - for(int c1=firstLine; c1"; - } - SourceLines += str; - } - if(lastLine!=lines.Count()) - { - SourceLines += "...\n"; - } - - SourceLinesFrame = frame; - return SourceLines; - } - - void ClearSelectedMessage() - { - SelectedMessage = -1; - SelectedCallstackFrame = -1; - ShowFrameSource = false; - } - - Vector2 LogListScrollPosition; - Vector2 LogDetailsScrollPosition; - - Texture2D ErrorIcon; - Texture2D WarningIcon; - Texture2D MessageIcon; - Texture2D SmallErrorIcon; - Texture2D SmallWarningIcon; - Texture2D SmallMessageIcon; - - bool ShowTimes = true; - float CurrentTopPaneHeight; - bool Resize = false; - Rect CursorChangeRect; - int SelectedMessage = -1; - - double LastMessageClickTime = 0; - double LastFrameClickTime = 0; - - - //Serialise the logger field so that Unity doesn't forget about the logger when you hit Play - [UnityEngine.SerializeField] - UberLoggerEditor EditorLogger; - - //Standard unity pro colours - // Color SelectedLineColour = new Color(35.0f/255.0f, 95.0f/255.0f, 153.0f/255.0f); - Color LineColour1; - Color LineColour2; - Color SizerLineColour; - - GUIStyle LogLineStyle; - GUIStyle SelectedLogLineStyle; - string CurrentChannel=null; - string FilterRegex = null; - bool ShowErrors = true; - bool ShowWarnings = true; - bool ShowMessages = true; - int SelectedCallstackFrame = 0; - bool ShowFrameSource = false; -} diff --git a/Assets/UberLogger/Editor/UberLoggerEditorWindow.cs.meta b/Assets/UberLogger/Editor/UberLoggerEditorWindow.cs.meta deleted file mode 100644 index 560c65f0d..000000000 --- a/Assets/UberLogger/Editor/UberLoggerEditorWindow.cs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 6ef03148bd3bd4ff99c7296168e907fb -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: diff --git a/Assets/UberLogger/Examples.meta b/Assets/UberLogger/Examples.meta deleted file mode 100644 index f0cf37a4b..000000000 --- a/Assets/UberLogger/Examples.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 46af38384518a4e179c0b324b0da9c21 -folderAsset: yes -timeCreated: 1437580112 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Examples/TestUberLogger.cs b/Assets/UberLogger/Examples/TestUberLogger.cs deleted file mode 100644 index 5b66ee505..000000000 --- a/Assets/UberLogger/Examples/TestUberLogger.cs +++ /dev/null @@ -1,62 +0,0 @@ -// -using UnityEngine; -using System.Collections; -using System.Collections.Generic; - -public class TestUberLogger : MonoBehaviour -{ - // Use this for initialization - void Start () - { - UberLogger.Logger.AddLogger(new UberLoggerFile("UberLogger.log"), false); - DoTest(); - var t = new List(); - t[0] = 5; - - } - - public void DoTest() - { - // UnityEngine.Debug.Log("Starting"); - Debug.LogWarning("Log Warning with GameObject", gameObject); - Debug.LogError("Log Error with GameObject", gameObject); - Debug.Log("Log Message with GameObject", gameObject); - Debug.LogFormat("Log Format param {0}", "Test"); - Debug.LogFormat(gameObject, "Log Format with GameObject and param {0}", "Test"); - - Debug.ULog("ULog"); - Debug.ULog("ULog with param {0}", "Test"); - Debug.ULog(gameObject, "ULog with GameObject"); - Debug.ULog(gameObject, "ULog with GameObject and param {0}", "Test"); - - Debug.ULogChannel("Test", "ULogChannel"); - Debug.ULogChannel("Test", "ULogChannel with param {0}", "Test"); - Debug.ULogChannel(gameObject, "Test", "ULogChannel with GameObject"); - Debug.ULogChannel(gameObject, "Test", "ULogChannel with GameObject and param {0}", "Test"); - - Debug.ULogWarning("ULogWarning"); - Debug.ULogWarning("ULogWarning with param {0}", "Test"); - Debug.ULogWarning(gameObject, "ULogWarning with GameObject"); - Debug.ULogWarning(gameObject, "ULogWarning with GameObject and param {0}", "Test"); - - Debug.ULogWarningChannel("Test", "ULogWarningChannel"); - Debug.ULogWarningChannel("Test", "ULogWarningChannel with param {0}", "Test"); - Debug.ULogWarningChannel(gameObject, "Test", "ULogWarningChannel with GameObject"); - Debug.ULogWarningChannel(gameObject, "Test", "ULogWarningChannel with GameObject and param {0}", "Test"); - - Debug.ULogError("ULogError"); - Debug.ULogError("ULogError with param {0}", "Test"); - Debug.ULogError(gameObject, "ULogError with GameObject"); - Debug.ULogError(gameObject, "ULogError with GameObject and param {0}", "Test"); - - Debug.ULogErrorChannel("Test", "ULogErrorChannel"); - Debug.ULogErrorChannel("Test", "ULogErrorChannel with param {0}", "Test"); - Debug.ULogErrorChannel(gameObject, "Test", "ULogErrorChannel with GameObject"); - Debug.ULogErrorChannel(gameObject, "Test", "ULogErrorChannel with GameObject and param {0}", "Test"); - } - - // Update is called once per frame - void Update () { - DoTest(); - } -} diff --git a/Assets/UberLogger/Examples/TestUberLogger.cs.meta b/Assets/UberLogger/Examples/TestUberLogger.cs.meta deleted file mode 100644 index b725fba55..000000000 --- a/Assets/UberLogger/Examples/TestUberLogger.cs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 88630061c1c4a4857b9aa37cccf293f0 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: diff --git a/Assets/UberLogger/Examples/TestUberLogger.unity b/Assets/UberLogger/Examples/TestUberLogger.unity deleted file mode 100644 index 33528fc1b..000000000 --- a/Assets/UberLogger/Examples/TestUberLogger.unity +++ /dev/null @@ -1,340 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -SceneSettings: - m_ObjectHideFlags: 0 - m_PVSData: - m_PVSObjectsArray: [] - m_PVSPortalsArray: [] - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: .25 - backfaceThreshold: 100 ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 6 - m_Fog: 0 - m_FogColor: {r: .5, g: .5, b: .5, a: 1} - m_FogMode: 3 - m_FogDensity: .00999999978 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1} - m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1} - m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 0 - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} - m_HaloStrength: .5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} ---- !u!157 &4 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 5 - m_GIWorkflowMode: 0 - m_LightmapsMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 1 - m_EnableRealtimeLightmaps: 1 - m_LightmapEditorSettings: - serializedVersion: 3 - m_Resolution: 2 - m_BakeResolution: 40 - m_TextureWidth: 1024 - m_TextureHeight: 1024 - m_AOMaxDistance: 1 - m_Padding: 2 - m_CompAOExponent: 0 - m_LightmapParameters: {fileID: 0} - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherRayCount: 1024 - m_ReflectionCompression: 2 - m_LightmapSnapshot: {fileID: 0} - m_RuntimeCPUUsage: 25 ---- !u!196 &5 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentRadius: .5 - agentHeight: 2 - agentSlope: 45 - agentClimb: .400000006 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - accuratePlacement: 0 - minRegionArea: 2 - cellSize: .166666672 - manualCellSize: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &96528619 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 96528621} - - 108: {fileID: 96528620} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!108 &96528620 -Light: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 96528619} - m_Enabled: 1 - serializedVersion: 6 - m_Type: 1 - m_Color: {r: 1, g: .956862748, b: .839215696, a: 1} - m_Intensity: 1 - m_Range: 10 - m_SpotAngle: 30 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_Strength: 1 - m_Bias: .0500000007 - m_NormalBias: .400000006 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_Lightmapping: 4 - m_BounceIntensity: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 - m_AreaSize: {x: 1, y: 1} ---- !u!4 &96528621 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 96528619} - m_LocalRotation: {x: .408217937, y: -.234569728, z: .109381676, w: .875426054} - m_LocalPosition: {x: 0, y: 3, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 ---- !u!1 &159539984 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 108080, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - m_PrefabInternal: {fileID: 1894830317} - serializedVersion: 4 - m_Component: - - 4: {fileID: 159539986} - - 114: {fileID: 159539985} - m_Layer: 0 - m_Name: UberAppConsole - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &159539985 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 11463974, guid: 82c521de7b47a4ce89bb1da3aa96e96f, - type: 2} - m_PrefabInternal: {fileID: 1894830317} - m_GameObject: {fileID: 159539984} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0e07a4dd7148412e9649a25c8abcb11, type: 3} - m_Name: - m_EditorClassIdentifier: - Skin: {fileID: 11400000, guid: 7018997e7c4ba41d8aa5a2338b82d57f, type: 2} - SmallErrorIcon: {fileID: 2800000, guid: f5e296e323cd64d619488c517c4692af, type: 3} - SmallWarningIcon: {fileID: 2800000, guid: ecc8f3c040a254019afd50c8bc285b48, type: 3} - SmallMessageIcon: {fileID: 2800000, guid: fa976bac27b1e440eb0d8bd71c1caac3, type: 3} - GUIColour: {r: 1, g: 1, b: 1, a: .781000018} - FontSize: 0 - SizerLineColour: {r: .164705887, g: .164705887, b: .164705887, a: 1} - SizerStartHeightRatio: .75 - ButtonTexture: {fileID: 2800000, guid: 2ae9477f7f0774b808aef406d3bf2d3c, type: 3} - ErrorButtonTexture: {fileID: 2800000, guid: f752d027f2368431c924c0306e747c4b, type: 3} - ButtonPosition: {x: 0, y: 0} - ButtonSize: {x: 32, y: 32} ---- !u!4 &159539986 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - m_PrefabInternal: {fileID: 1894830317} - m_GameObject: {fileID: 159539984} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 22.7158318, y: -1.60936856, z: 6.47446775} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 ---- !u!1 &221752931 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 4 - m_Component: - - 4: {fileID: 221752936} - - 20: {fileID: 221752935} - - 92: {fileID: 221752934} - - 124: {fileID: 221752933} - - 81: {fileID: 221752932} - - 114: {fileID: 221752937} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &221752932 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 221752931} - m_Enabled: 1 ---- !u!124 &221752933 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 221752931} - m_Enabled: 1 ---- !u!92 &221752934 -Behaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 221752931} - m_Enabled: 1 ---- !u!20 &221752935 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 221752931} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: .300000012 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: .0219999999 - m_StereoMirrorMode: 0 ---- !u!4 &221752936 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 221752931} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!114 &221752937 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 221752931} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 88630061c1c4a4857b9aa37cccf293f0, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &1894830317 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_LocalPosition.x - value: 22.7158318 - objectReference: {fileID: 0} - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_LocalPosition.y - value: -1.60936856 - objectReference: {fileID: 0} - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_LocalPosition.z - value: 6.47446775 - objectReference: {fileID: 0} - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 464206, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: 82c521de7b47a4ce89bb1da3aa96e96f, type: 2} - m_RootGameObject: {fileID: 159539984} - m_IsPrefabParent: 0 diff --git a/Assets/UberLogger/Examples/TestUberLogger.unity.meta b/Assets/UberLogger/Examples/TestUberLogger.unity.meta deleted file mode 100644 index 53f48e2d8..000000000 --- a/Assets/UberLogger/Examples/TestUberLogger.unity.meta +++ /dev/null @@ -1,5 +0,0 @@ -fileFormatVersion: 2 -guid: dc3e87c7488b748b59aeef00e7b50c02 -DefaultImporter: - userData: - assetBundleName: diff --git a/Assets/UberLogger/LICENSE b/Assets/UberLogger/LICENSE deleted file mode 100644 index c2ebf8e79..000000000 --- a/Assets/UberLogger/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015 bbbscarter - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - diff --git a/Assets/UberLogger/LICENSE.meta b/Assets/UberLogger/LICENSE.meta deleted file mode 100644 index 30d3a9b34..000000000 --- a/Assets/UberLogger/LICENSE.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f8478442035604d6c9af1c71c9733e99 -timeCreated: 1440268457 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Pics.meta b/Assets/UberLogger/Pics.meta deleted file mode 100644 index 9cfc74c67..000000000 --- a/Assets/UberLogger/Pics.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: c8ec9229de0ff4d198015ed626773e9e -folderAsset: yes -timeCreated: 1438190280 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Pics/UberConsoleEditor.png b/Assets/UberLogger/Pics/UberConsoleEditor.png deleted file mode 100644 index 054a96915..000000000 Binary files a/Assets/UberLogger/Pics/UberConsoleEditor.png and /dev/null differ diff --git a/Assets/UberLogger/Pics/UberConsoleEditor.png.meta b/Assets/UberLogger/Pics/UberConsoleEditor.png.meta deleted file mode 100644 index 85bec9d7e..000000000 --- a/Assets/UberLogger/Pics/UberConsoleEditor.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 956a7045f98324f14909698e76c69aca -timeCreated: 1438191103 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/Pics/UberConsoleGame.png b/Assets/UberLogger/Pics/UberConsoleGame.png deleted file mode 100644 index 3c49803f2..000000000 Binary files a/Assets/UberLogger/Pics/UberConsoleGame.png and /dev/null differ diff --git a/Assets/UberLogger/Pics/UberConsoleGame.png.meta b/Assets/UberLogger/Pics/UberConsoleGame.png.meta deleted file mode 100644 index 57605fff2..000000000 --- a/Assets/UberLogger/Pics/UberConsoleGame.png.meta +++ /dev/null @@ -1,55 +0,0 @@ -fileFormatVersion: 2 -guid: 38968d44a1fcb411fa62f629016048a6 -timeCreated: 1438191103 -licenseType: Free -TextureImporter: - fileIDToRecycleName: {} - serializedVersion: 2 - mipmaps: - mipMapMode: 0 - enableMipMap: 1 - linearTexture: 0 - correctGamma: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: .25 - normalMapFilter: 0 - isReadable: 0 - grayScaleToAlpha: 0 - generateCubemap: 0 - cubemapConvolution: 0 - cubemapConvolutionSteps: 8 - cubemapConvolutionExponent: 1.5 - seamlessCubemap: 0 - textureFormat: -1 - maxTextureSize: 2048 - textureSettings: - filterMode: -1 - aniso: -1 - mipBias: -1 - wrapMode: -1 - nPOTScale: 1 - lightmap: 0 - rGBM: 0 - compressionQuality: 50 - spriteMode: 0 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: .5, y: .5} - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spritePixelsToUnits: 100 - alphaIsTransparency: 0 - textureType: -1 - buildTargetSettings: [] - spriteSheet: - sprites: [] - spritePackingTag: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/README.md b/Assets/UberLogger/README.md deleted file mode 100644 index 952023743..000000000 --- a/Assets/UberLogger/README.md +++ /dev/null @@ -1,53 +0,0 @@ -# UberLogger -UberLogger is a free, modular, opensource replacement for Unity's -Debug.Log system. It also includes UberConsole, a replacement for -Unity's editor console, an in game console version of UberConsole and -a file logger. - -UberConsole looks like this: - -![](Pics/UberConsoleEditor.png) - -And the in-game version looks like this: - -![](Pics/UberConsoleGame.png) - -## Core Features -* Drop in replacement for Unity's Debug.Log() methods. No code changes - needed. -* A threadsafe, modular backend that supports any number of loggers, - so Debug.Log can be routed to multiple locations. The supplied file - logger should work on mobile devices. -* Included are a replacement editor console, an in-game console and a - file logger. -* Support for named debug channels - Debug.LogChannel("Boot", "Some - message") can be filtered based on the channel name. -* Methods may be marked as excluded from callstacks by tagging them - with '[StackTraceIgnore]', to keep your logs tidy. - -## UberConsole Features -* More compact view shows more errors in the same space. -* Supports debug log channels -* Messages can be filtered by regular expressions -* Timestamps -* Source code can be shown inline with the callstack. -* An in-game version of UberConsole is also provided. - -## Installation -* Stick the UberLogger folder somewhere under your Unity project - Assets folder. -* To view the editor UberConsole, go to Window->Show Uber Console. -* To use UberConsole in your game, drag the UberAppConsole prefab into - your scene. -* Usage examples can be seen in the Examples folder. - -## Notes -* Currently only tested in Unity 4 and 5 Free, but should work in Pro. -* Due to file incompatibilities, the in-game console skin doesn't work - in Unity 4 and would need to be set up again. Same with the - prefab. That said, the code works, and so does the editor UberConsole. -* Pull requests welcome! - - * * * * - -[UberLogger]: https://github.com/bbbscarter/UberLogger diff --git a/Assets/UberLogger/README.md.meta b/Assets/UberLogger/README.md.meta deleted file mode 100644 index 43488ee47..000000000 --- a/Assets/UberLogger/README.md.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 951b1a41f8f1d4c57b6fbcc74ca23057 -timeCreated: 1438190280 -licenseType: Free -DefaultImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/UberAppConsole.prefab b/Assets/UberLogger/UberAppConsole.prefab deleted file mode 100644 index 944412df9..000000000 --- a/Assets/UberLogger/UberAppConsole.prefab +++ /dev/null @@ -1,64 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &108080 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 4 - m_Component: - - 4: {fileID: 464206} - - 114: {fileID: 11463974} - m_Layer: 0 - m_Name: UberAppConsole - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &464206 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 108080} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 22.7158318, y: -1.60936856, z: 6.47446775} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 ---- !u!114 &11463974 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 108080} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a0e07a4dd7148412e9649a25c8abcb11, type: 3} - m_Name: - m_EditorClassIdentifier: - Skin: {fileID: 11400000, guid: 7018997e7c4ba41d8aa5a2338b82d57f, type: 2} - SmallErrorIcon: {fileID: 2800000, guid: f5e296e323cd64d619488c517c4692af, type: 3} - SmallWarningIcon: {fileID: 2800000, guid: ecc8f3c040a254019afd50c8bc285b48, type: 3} - SmallMessageIcon: {fileID: 2800000, guid: fa976bac27b1e440eb0d8bd71c1caac3, type: 3} - GUIColour: {r: 1, g: 1, b: 1, a: .781000018} - FontSize: 0 - SizerLineColour: {r: .164705887, g: .164705887, b: .164705887, a: 1} - SizerStartHeightRatio: .75 - ButtonTexture: {fileID: 2800000, guid: 2ae9477f7f0774b808aef406d3bf2d3c, type: 3} - ErrorButtonTexture: {fileID: 2800000, guid: f752d027f2368431c924c0306e747c4b, type: 3} - ButtonPosition: {x: 0, y: 0} - ButtonSize: {x: 32, y: 32} ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 108080} - m_IsPrefabParent: 1 diff --git a/Assets/UberLogger/UberAppConsole.prefab.meta b/Assets/UberLogger/UberAppConsole.prefab.meta deleted file mode 100644 index fff0c85c6..000000000 --- a/Assets/UberLogger/UberAppConsole.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 82c521de7b47a4ce89bb1da3aa96e96f -timeCreated: 1438191581 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/UberLogger.cs b/Assets/UberLogger/UberLogger.cs deleted file mode 100644 index d24360dc5..000000000 --- a/Assets/UberLogger/UberLogger.cs +++ /dev/null @@ -1,540 +0,0 @@ -// -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System.Diagnostics; -using System; - -#if UNITY_EDITOR -using UnityEditor; -#endif - -namespace UberLogger -{ - //Use this to exclude methods from the stack trace - [AttributeUsage(AttributeTargets.Method)] - public class StackTraceIgnore : Attribute { } - - //Use this to stop UberLogger handling logs with this in the callstack. - [AttributeUsage(AttributeTargets.Method)] - public class LogUnityOnly : Attribute { } - - public enum LogSeverity - { - Message, - Warning, - Error, - } - - /// - /// Interface for deriving new logger backends. - /// Add a new logger via Logger.AddLogger() - /// - public interface ILogger - { - /// - /// Logging backend entry point. logInfo contains all the information about the logging request. - /// - void Log(LogInfo logInfo); - } - - - //Information about a particular frame of a callstack - [System.Serializable] - public class LogStackFrame - { - public string MethodName; - public string DeclaringType; - public string ParameterSig; - - public int LineNumber; - public string FileName; - - string FormattedMethodName; - - /// - /// Convert from a .Net stack frame - /// - public LogStackFrame(StackFrame frame) - { - var method = frame.GetMethod(); - MethodName = method.Name; - DeclaringType = method.DeclaringType.Name; - - var pars = method.GetParameters(); - for (int c1 = 0; c1 < pars.Length; c1++) - { - ParameterSig += String.Format("{0} {1}", pars[c1].ParameterType, pars[c1].Name); - if (c1 + 1 < pars.Length) - { - ParameterSig += ", "; - } - } - - FileName = frame.GetFileName(); - LineNumber = frame.GetFileLineNumber(); - FormattedMethodName = MakeFormattedMethodName(); - } - - /// - /// Convert from a Unity stack frame (for internal Unity errors rather than excpetions) - /// - public LogStackFrame(string unityStackFrame) - { - if (Logger.ExtractInfoFromUnityStackInfo(unityStackFrame, ref DeclaringType, ref MethodName, ref FileName, ref LineNumber)) - { - FormattedMethodName = MakeFormattedMethodName(); - } - else - { - FormattedMethodName = unityStackFrame; - } - } - - - /// - /// Basic stack frame info when we have nothing else - /// - public LogStackFrame(string message, string filename, int lineNumber) - { - FileName = filename; - LineNumber = lineNumber; - FormattedMethodName = message; - } - - - - public string GetFormattedMethodName() - { - return FormattedMethodName; - } - - /// - /// Make a nice string showing the stack information - used by the loggers - /// - string MakeFormattedMethodName() - { - string filename = FileName; - if (!String.IsNullOrEmpty(FileName)) - { - var startSubName = FileName.IndexOf("Assets", StringComparison.OrdinalIgnoreCase); - - if (startSubName > 0) - { - filename = FileName.Substring(startSubName); - } - } - string methodName = String.Format("{0}.{1}({2}) (at {3}:{4})", DeclaringType, MethodName, ParameterSig, filename, LineNumber); - return methodName; - } - } - - /// - /// A single item of logging information - /// - [System.Serializable] - public class LogInfo - { - public UnityEngine.Object Source; - public string Channel; - public LogSeverity Severity; - public string Message; - public List Callstack; - public double TimeStamp; - string TimeStampAsString; - - public string GetTimeStampAsString() - { - return TimeStampAsString; - } - - public LogInfo(UnityEngine.Object source, string channel, LogSeverity severity, List callstack, object message, params object[] par) - { - Source = source; - Channel = channel; - Severity = severity; - Message = ""; - - var messageString = message as String; - if (messageString != null) - { - if (par.Length > 0) - { - Message = System.String.Format(messageString, par); - } - else - { - Message = messageString; - } - } - else - { - if (message != null) - { - Message = message.ToString(); - } - } - - Callstack = callstack; - TimeStamp = Logger.GetTime(); - TimeStampAsString = String.Format("{0:0.0000}", TimeStamp); - } - } - - /// - /// The core of UberLogger - the entry point for logging information - /// - public static class Logger - { - // Controls how many historical messages to keep to pass into newly registered loggers - public static int MaxMessagesToKeep = 1000; - - // If true, any logs sent to UberLogger will be forwarded on to the Unity logger. - // Useful if you want to use both systems - public static bool ForwardMessages = true; - - static List Loggers = new List(); - static LinkedList RecentMessages = new LinkedList(); - static double StartTime; - static bool AlreadyLogging = false; - - static Logger() - { - // Register with Unity's logging system -#if UNITY_5 - Application.logMessageReceived += UnityLogHandler; -#else - Application.RegisterLogCallback(UnityLogHandler); -#endif - StartTime = GetTime(); - } - - /// - /// Registered Unity error handler - /// - [StackTraceIgnore] - static void UnityLogHandler(string logString, string stackTrace, UnityEngine.LogType logType) - { - UnityLogInternal(logString, stackTrace, logType); - } - - static public double GetTime() - { -#if UNITY_EDITOR - return EditorApplication.timeSinceStartup - StartTime; -#else - double time = Time.time; - return time - StartTime; -#endif - } - - /// - /// Registers a new logger backend, which we be told every time there's a new log. - /// if populateWithExistingMessages is true, UberLogger will immediately pump the new logger with past messages - /// - static public void AddLogger(ILogger logger, bool populateWithExistingMessages = true) - { - lock (Loggers) - { - if (populateWithExistingMessages) - { - foreach (var oldLog in RecentMessages) - { - logger.Log(oldLog); - } - } - - if (!Loggers.Contains(logger)) - { - Loggers.Add(logger); - } - } - } - - /// - /// Tries to extract useful information about the log from a Unity error message. - /// Only used when handling a Unity error message and we can't get a useful callstack - /// - static public bool ExtractInfoFromUnityMessage(string log, ref string filename, ref int lineNumber) - { - // log = "Assets/Code/Debug.cs(140,21): warning CS0618: 'some error' - var match = System.Text.RegularExpressions.Regex.Matches(log, @"(.*)\((\d+).*\)"); - - if (match.Count > 0) - { - filename = match[0].Groups[1].Value; - lineNumber = Convert.ToInt32(match[0].Groups[2].Value); - return true; - } - return false; - } - - - /// - /// Tries to extract useful information about the log from a Unity stack trace - /// - static public bool ExtractInfoFromUnityStackInfo(string log, ref string declaringType, ref string methodName, ref string filename, ref int lineNumber) - { - // log = "DebugLoggerEditorWindow.DrawLogDetails () (at Assets/Code/Editor.cs:298)"; - var match = System.Text.RegularExpressions.Regex.Matches(log, @"(.*)\.(.*)\s*\(.*\(at (.*):(\d+)"); - - if (match.Count > 0) - { - declaringType = match[0].Groups[1].Value; - methodName = match[0].Groups[2].Value; - filename = match[0].Groups[3].Value; - lineNumber = Convert.ToInt32(match[0].Groups[4].Value); - return true; - } - return false; - } - - /// - /// Converts the curent stack trace into a list of UberLogger's LogStackFrame. - /// Excludes any methods with the StackTraceIgnore attribute - /// Returns false if the stack frame contains any methods flagged as LogUnityOnly - /// - [StackTraceIgnore] - static bool GetCallstack(ref List callstack) - { - callstack.Clear(); - StackTrace stackTrace = new StackTrace(true); // get call stack - StackFrame[] stackFrames = stackTrace.GetFrames(); // get method calls (frames) - - foreach (StackFrame stackFrame in stackFrames) - { - var method = stackFrame.GetMethod(); - if (method.IsDefined(typeof(LogUnityOnly), true)) - { - return true; - } - if (!method.IsDefined(typeof(StackTraceIgnore), true)) - { - //Cut out some internal noise from Unity stuff - if (!(method.Name == "CallLogCallback" && method.DeclaringType.Name == "Application") - && !(method.DeclaringType.Name == "Debug" && (method.Name == "Internal_Log" || method.Name == "Log"))) - { - var logStackFrame = new LogStackFrame(stackFrame); - - callstack.Add(logStackFrame); - - } - } - } - - return false; - } - - /// - /// Converts a Unity callstack string into a list of UberLogger's LogStackFrame - /// Doesn't do any filtering, since this should only be dealing with internal Unity errors rather than client code - /// - static List GetCallstackFromUnityLog(string unityCallstack) - { - var lines = System.Text.RegularExpressions.Regex.Split(unityCallstack, System.Environment.NewLine); - var stack = new List(); - foreach (var line in lines) - { - var frame = new LogStackFrame(line); - if (!string.IsNullOrEmpty(frame.GetFormattedMethodName())) - { - stack.Add(new LogStackFrame(line)); - } - } - return stack; - } - - /// - /// The core entry point of all logging coming from Unity. Takes a log request, creates the call stack and pumps it to all the backends - /// - [StackTraceIgnore()] - static void UnityLogInternal(string unityMessage, string unityCallStack, UnityEngine.LogType logType) - { - //Make sure only one thread can do this at a time. - //This should mean that most backends don't have to worry about thread safety (unless they do complicated stuff) - lock (Loggers) - { - //Prevent nasty recursion problems - if (!AlreadyLogging) - { - try - { - AlreadyLogging = true; - - var callstack = new List(); - var unityOnly = GetCallstack(ref callstack); - if (unityOnly) - { - return; - } - - //If we have no useful callstack, fall back to parsing Unity's callstack - if (callstack.Count == 0) - { - callstack = GetCallstackFromUnityLog(unityCallStack); - } - - LogSeverity severity; - switch (logType) - { - case UnityEngine.LogType.Error: severity = LogSeverity.Error; break; - case UnityEngine.LogType.Exception: severity = LogSeverity.Error; break; - case UnityEngine.LogType.Warning: severity = LogSeverity.Warning; break; - default: severity = LogSeverity.Message; break; - } - - string filename = ""; - int lineNumber = 0; - - //Finally, parse the error message so we can get basic file and line information - if (ExtractInfoFromUnityMessage(unityMessage, ref filename, ref lineNumber)) - { - callstack.Insert(0, new LogStackFrame(unityMessage, filename, lineNumber)); - } - - var logInfo = new LogInfo(null, "", severity, callstack, unityMessage); - - //Add this message to our history - RecentMessages.AddLast(logInfo); - - //Make sure our history doesn't get too big - TrimOldMessages(); - - //Delete any dead loggers and pump them with the new log - Loggers.RemoveAll(l => l == null); - Loggers.ForEach(l => l.Log(logInfo)); - } - finally - { - AlreadyLogging = false; - } - } - } - } - - - /// - /// The core entry point of all logging coming from client code. - /// Takes a log request, creates the call stack and pumps it to all the backends - /// - [StackTraceIgnore()] - static public void Log(string channel, UnityEngine.Object source, LogSeverity severity, object message, params object[] par) - { - lock (Loggers) - { - if (!AlreadyLogging) - { - try - { - AlreadyLogging = true; - var callstack = new List(); - var unityOnly = GetCallstack(ref callstack); - if (unityOnly) - { - return; - } - - var logInfo = new LogInfo(source, channel, severity, callstack, SquashToOneLine(message), par); - - //Add this message to our history - RecentMessages.AddLast(logInfo); - - //Make sure our history doesn't get too big - TrimOldMessages(); - - //Delete any dead loggers and pump them with the new log - Loggers.RemoveAll(l => l == null); - Loggers.ForEach(l => l.Log(logInfo)); - - //If required, pump this message back into Unity - if (ForwardMessages) - { - ForwardToUnity(source, severity, message, par); - } - } - finally - { - AlreadyLogging = false; - } - } - } - } - /// - /// Helperfunction to reduce multiline messages to one line. - /// - /// Message make one line only - /// Message free of linebreaks - private static object SquashToOneLine(object message) - { - message = message.ToString().Replace("\r\n", " "); - message = message.ToString().Replace("\n", " "); - - return (object)message; - } - - /// - /// Forwards an UberLogger log to Unity so it's visible in the built-in console - /// - [LogUnityOnly()] - static void ForwardToUnity(UnityEngine.Object source, LogSeverity severity, object message, params object[] par) - { - object showObject = null; - if (message != null) - { - var messageAsString = message as string; - if (messageAsString != null) - { - if (par.Length > 0) - { - showObject = String.Format(messageAsString, par); - } - else - { - showObject = message; - } - } - else - { - showObject = message; - } - } - - if (source == null) - { - if (severity == LogSeverity.Message) UnityEngine.Debug.Log(showObject); - else if (severity == LogSeverity.Warning) UnityEngine.Debug.LogWarning(showObject); - else if (severity == LogSeverity.Error) UnityEngine.Debug.LogError(showObject); - } - else - { - if (severity == LogSeverity.Message) UnityEngine.Debug.Log(showObject, source); - else if (severity == LogSeverity.Warning) UnityEngine.Debug.LogWarning(showObject, source); - else if (severity == LogSeverity.Error) UnityEngine.Debug.LogError(showObject, source); - } - } - - /// - /// Finds a registered logger, if it exists - /// - static public T GetLogger() where T : class - { - foreach (var logger in Loggers) - { - if (logger is T) - { - return logger as T; - } - } - return null; - } - - static void TrimOldMessages() - { - while (RecentMessages.Count > MaxMessagesToKeep) - { - RecentMessages.RemoveFirst(); - } - } - } - -} diff --git a/Assets/UberLogger/UberLogger.cs.meta b/Assets/UberLogger/UberLogger.cs.meta deleted file mode 100644 index b0adbfbc3..000000000 --- a/Assets/UberLogger/UberLogger.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: b82f8d256ff5d4555b51e2cf116640e1 -timeCreated: 1437572839 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/UberLoggerAppWindow.cs b/Assets/UberLogger/UberLoggerAppWindow.cs deleted file mode 100644 index 643d37abd..000000000 --- a/Assets/UberLogger/UberLoggerAppWindow.cs +++ /dev/null @@ -1,496 +0,0 @@ -// -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using System; -using UberLogger; - - -/// -/// The in-app console logging frontend and backend -/// -public class UberLoggerAppWindow : MonoBehaviour, UberLogger.ILogger -{ - public GUISkin Skin; - public Texture2D SmallErrorIcon; - public Texture2D SmallWarningIcon; - public Texture2D SmallMessageIcon; - public Color GUIColour = new Color(1, 1, 1, 0.5f); - - //If non-zero, scales the fonts - public int FontSize = 0; - public Color SizerLineColour = new Color(42.0f/255.0f, 42.0f/255.0f, 42.0f/255.0f); - public float SizerStartHeightRatio = 0.75f; - - public void Log(LogInfo logInfo) - { - LogInfo.Add(logInfo); - if(logInfo.Severity==LogSeverity.Error) - { - NoErrors++; - } - else if(logInfo.Severity==LogSeverity.Warning) - { - NoWarnings++; - } - else - { - NoMessages++; - } - if(logInfo.Severity==LogSeverity.Error && PauseOnError) - { - UnityEngine.Debug.Break(); - } - } - - void Clear() - { - LogInfo.Clear(); - NoWarnings = 0; - NoErrors = 0; - NoMessages = 0; - } - - void Start() - { - DontDestroyOnLoad(gameObject); - UberLogger.Logger.AddLogger(this); - ClearSelectedMessage(); - WindowRect = new Rect(0,0, Screen.width/2, Screen.height); - CurrentTopPaneHeight = Screen.height*SizerStartHeightRatio; - } - - bool ShowWindow = false; - public Texture2D ButtonTexture; - public Texture2D ErrorButtonTexture; - public Vector2 ButtonPosition; - public Vector2 ButtonSize = new Vector2(32, 32); - - /// - /// Shows either the activation button or the full UI - /// - public void OnGUI() - { - GUI.skin = Skin; - if(ShowWindow) - { - var oldGUIColor = GUI.color; - GUI.color = GUIColour; - WindowRect = new Rect(0,0, Screen.width/2, Screen.height); - //Set up the basic style, based on the Unity defaults - LogLineStyle1 = Skin.customStyles[0]; - LogLineStyle2 = Skin.customStyles[1]; - SelectedLogLineStyle = Skin.customStyles[2]; - - - - LogLineStyle1.fontSize = FontSize; - LogLineStyle2.fontSize = FontSize; - SelectedLogLineStyle.fontSize = FontSize; - - WindowRect = GUILayout.Window(1, WindowRect, DrawWindow, "Uber Console", GUI.skin.window); - GUI.color = oldGUIColor; - } - else - { - DrawActivationButton(); - } - } - - public void DrawActivationButton() - { - Texture2D buttonTex = ButtonTexture; - if(NoErrors>0) - { - buttonTex = ErrorButtonTexture; - } - var buttonPos = ButtonPosition; - buttonPos.x*=Screen.width; - buttonPos.y*=Screen.height; - if(buttonPos.x+ButtonSize.x> Screen.width) - { - buttonPos.x = Screen.width-ButtonSize.x; - } - if(buttonPos.y+ButtonSize.y > Screen.height) - { - buttonPos.y = Screen.height-ButtonSize.y; - } - var buttonRect = new Rect(buttonPos.x, buttonPos.y, ButtonSize.x, ButtonSize.y); - var style = new GUIStyle(); - - if(GUI.Button(buttonRect, buttonTex, style)) - { - ShowWindow = !ShowWindow; - } - } - - /// - /// Draws the main window - /// - void DrawWindow(int windowID) - { - // GUI.DragWindow(new Rect(0, 0, 10000, 20)); - var oldGUIColour = GUI.color; - GUI.color = GUIColour; - GUILayout.BeginVertical(GUILayout.Height(CurrentTopPaneHeight-GUI.skin.window.padding.top), GUILayout.MinHeight(100)); - DrawToolbar(); - DrawFilter(); - DrawChannels(); - DrawLogList(); - GUILayout.EndVertical(); - ResizeTopPane(); - - //Create a small gap so the resize handle isn't overwritten - GUILayout.Space(10); - GUILayout.BeginVertical(); - DrawLogDetails(); - GUILayout.EndVertical(); - GUI.color = oldGUIColour; - - DrawActivationButton(); - } - - //Some helper functions to draw buttons that are only as big as their text - bool ButtonClamped(string text, GUIStyle style) - { - return GUILayout.Button(text, style, GUILayout.MaxWidth(style.CalcSize(new GUIContent(text)).x)); - } - - bool ToggleClamped(bool state, string text, GUIStyle style) - { - return GUILayout.Toggle(state, text, style, GUILayout.MaxWidth(style.CalcSize(new GUIContent(text)).x)); - } - - bool ToggleClamped(bool state, GUIContent content, GUIStyle style, params GUILayoutOption[] par) - { - return GUILayout.Toggle(state, content, style, GUILayout.MaxWidth(style.CalcSize(content).x)); - } - - void LabelClamped(string text, GUIStyle style) - { - GUILayout.Label(text, style, GUILayout.MaxWidth(style.CalcSize(new GUIContent(text)).x)); - } - - /// - /// Draws the thin, Unity-style toolbar showing error counts and toggle buttons - /// - void DrawToolbar() - { - var toolbarStyle = GUI.skin.customStyles[3]; - GUILayout.BeginHorizontal(); - if(ButtonClamped("Clear", toolbarStyle)) - { - Clear(); - } - // PauseOnError = ToggleClamped(PauseOnError, "Pause On Error", toolbarStyle); - ShowTimes = ToggleClamped(ShowTimes, "Show Times", toolbarStyle); - - var buttonSize = toolbarStyle.CalcSize(new GUIContent("T")).y; - GUILayout.FlexibleSpace(); - - var showErrors = ToggleClamped(ShowErrors, new GUIContent(NoErrors.ToString(), SmallErrorIcon), toolbarStyle, GUILayout.Height(buttonSize)); - var showWarnings = ToggleClamped(ShowWarnings, new GUIContent(NoWarnings.ToString(), SmallWarningIcon), toolbarStyle, GUILayout.Height(buttonSize)); - var showMessages = ToggleClamped(ShowMessages, new GUIContent(NoMessages.ToString(), SmallMessageIcon), toolbarStyle, GUILayout.Height(buttonSize)); - //If the errors/warning to show has changed, clear the selected message - if(showErrors!=ShowErrors || showWarnings!=ShowWarnings || showMessages!=ShowMessages) - { - ClearSelectedMessage(); - } - ShowWarnings = showWarnings; - ShowMessages = showMessages; - ShowErrors = showErrors; - GUILayout.EndHorizontal(); - } - - /// - /// Draws the channel selector - /// - void DrawChannels() - { - var channels = GetChannels(); - int currentChannelIndex = 0; - for(int c1=0; c1 - /// Based on filter and channel selections, should this log be shown? - /// - bool ShouldShowLog(System.Text.RegularExpressions.Regex regex, LogInfo log) - { - if(log.Channel==CurrentChannel || CurrentChannel=="All" || (CurrentChannel=="No Channel" && String.IsNullOrEmpty(log.Channel))) - { - if((log.Severity==LogSeverity.Message && ShowMessages) - || (log.Severity==LogSeverity.Warning && ShowWarnings) - || (log.Severity==LogSeverity.Error && ShowErrors)) - { - if(regex==null || regex.IsMatch(log.Message)) - { - return true; - } - } - } - - return false; - } - - /// - /// Draws the main log panel - /// - public void DrawLogList() - { - var oldColor = GUI.backgroundColor; - - LogListScrollPosition = GUILayout.BeginScrollView(LogListScrollPosition); - var maxLogPanelHeight = WindowRect.height; - - float buttonY = 0; - float buttonHeight = LogLineStyle1.CalcSize(new GUIContent("Test")).y; - - System.Text.RegularExpressions.Regex filterRegex = null; - - if(!String.IsNullOrEmpty(FilterRegex)) - { - filterRegex = new System.Text.RegularExpressions.Regex(FilterRegex); - } - - int drawnButtons = 0; - var logLineStyle = LogLineStyle1; - for(int c1=0; c1LogListScrollPosition.y && buttonY - /// The bottom of the panel - details of the selected log - /// - public void DrawLogDetails() - { - var oldColor = GUI.backgroundColor; - SelectedMessage = Mathf.Clamp(SelectedMessage, 0, LogInfo.Count); - if(LogInfo.Count>0 && SelectedMessage>=0) - { - LogDetailsScrollPosition = GUILayout.BeginScrollView(LogDetailsScrollPosition); - var log = LogInfo[SelectedMessage]; - var logLineStyle = LogLineStyle1; - for(int c1=0; c1 GetChannels() - { - var categories = new HashSet(); - foreach(var logInfo in LogInfo) - { - if(!String.IsNullOrEmpty(logInfo.Channel) && !categories.Contains(logInfo.Channel)) - { - categories.Add(logInfo.Channel); - } - } - - var channelList = new List(); - channelList.Add("All"); - channelList.Add("No Channel"); - channelList.AddRange(categories); - return channelList; - } - - bool Resizing = false; - private void ResizeTopPane() - { - //Set up the resize collision rect - // float offset = GUI.skin.window.border.bottom; - float offset = 0; - var resizerRect = new Rect(0, CurrentTopPaneHeight+offset, WindowRect.width, 5f); - - var oldColor = GUI.color; - GUI.color = SizerLineColour; - GUI.DrawTexture(resizerRect, Texture2D.whiteTexture); - GUI.color = oldColor; - - if( Event.current.type == EventType.mouseDown && resizerRect.Contains(Event.current.mousePosition)) - { - Resizing = true; - } - - if(Resizing) - { - CurrentTopPaneHeight = Event.current.mousePosition.y; - } - - if(Event.current.type == EventType.MouseUp) - { - Resizing = false; - } - - - CurrentTopPaneHeight = Mathf.Clamp(CurrentTopPaneHeight, 100, WindowRect.height-100); - } - - void ClearSelectedMessage() - { - SelectedMessage = -1; - SelectedCallstackFrame = -1; - } - - Vector2 LogListScrollPosition; - Vector2 LogDetailsScrollPosition; - - - bool ShowTimes = true; - float CurrentTopPaneHeight; - int SelectedMessage = -1; - - double LastMessageClickTime = 0; - - List LogInfo = new List(); - bool PauseOnError = false; - int NoErrors; - int NoWarnings; - int NoMessages; - Rect WindowRect = new Rect(0,0, 100, 100); - - - GUIStyle LogLineStyle1; - GUIStyle LogLineStyle2; - GUIStyle SelectedLogLineStyle; - string CurrentChannel=null; - string FilterRegex = ""; - - bool ShowErrors = true; - bool ShowWarnings = true; - bool ShowMessages = true; - int SelectedCallstackFrame = 0; -} diff --git a/Assets/UberLogger/UberLoggerAppWindow.cs.meta b/Assets/UberLogger/UberLoggerAppWindow.cs.meta deleted file mode 100644 index c2d05c855..000000000 --- a/Assets/UberLogger/UberLoggerAppWindow.cs.meta +++ /dev/null @@ -1,19 +0,0 @@ -fileFormatVersion: 2 -guid: a0e07a4dd7148412e9649a25c8abcb11 -timeCreated: 1437728182 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: - - Skin: {fileID: 11400000, guid: 7018997e7c4ba41d8aa5a2338b82d57f, type: 2} - - ButtonTexture: {fileID: 2800000, guid: 2ae9477f7f0774b808aef406d3bf2d3c, type: 3} - - ErrorButtonTexture: {fileID: 2800000, guid: f752d027f2368431c924c0306e747c4b, - type: 3} - - SmallErrorIcon: {fileID: 2800000, guid: f5e296e323cd64d619488c517c4692af, type: 3} - - SmallWarningIcon: {fileID: 2800000, guid: ecc8f3c040a254019afd50c8bc285b48, type: 3} - - SmallMessageIcon: {fileID: 2800000, guid: fa976bac27b1e440eb0d8bd71c1caac3, type: 3} - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/UberLogger/UberLoggerEditor.cs b/Assets/UberLogger/UberLoggerEditor.cs deleted file mode 100644 index 4ea9b76f3..000000000 --- a/Assets/UberLogger/UberLoggerEditor.cs +++ /dev/null @@ -1,111 +0,0 @@ -// -#if UNITY_EDITOR -using UnityEngine; -using System.Collections; -using System.Collections.Generic; -using System; -using UnityEditor; -using UberLogger; - - -/// -/// The basic editor logger backend -/// This is seperate from the editor frontend, so we can have multiple frontends active if we wish, -/// and so that we catch errors even without the frontend active. -/// Derived from ScriptableObject so it persists across play sessions. -/// -[System.Serializable] -public class UberLoggerEditor : ScriptableObject, UberLogger.ILogger -{ - public List LogInfo = new List(); - public bool PauseOnError = false; - public bool ClearOnPlay = true; - public bool WasPlaying = false; - - static public UberLoggerEditor Create() - { - var editorDebug = ScriptableObject.FindObjectOfType(); - - if(editorDebug==null) - { - editorDebug = ScriptableObject.CreateInstance(); - } - - editorDebug.NoErrors = 0; - editorDebug.NoWarnings = 0; - editorDebug.NoMessages = 0; - - return editorDebug; - } - - public void OnEnable() - { - EditorApplication.playmodeStateChanged += OnPlaymodeStateChanged; - - //Make this scriptable object persist between Play sessions - hideFlags = HideFlags.HideAndDontSave; - } - - /// - /// If we're about to start playing and 'ClearOnPlay' is set, clear the current logs - /// - public void ProcessOnStartClear() - { - if(!WasPlaying && EditorApplication.isPlayingOrWillChangePlaymode) - { - if(ClearOnPlay) - { - Clear(); - } - } - WasPlaying = EditorApplication.isPlayingOrWillChangePlaymode; - } - - void OnPlaymodeStateChanged() - { - ProcessOnStartClear(); - } - - public int NoErrors; - public int NoWarnings; - public int NoMessages; - public HashSet Channels = new HashSet(); - - public void Log(LogInfo logInfo) - { - if(!String.IsNullOrEmpty(logInfo.Channel) && !Channels.Contains(logInfo.Channel)) - { - Channels.Add(logInfo.Channel); - } - - ProcessOnStartClear(); - LogInfo.Add(logInfo); - if(logInfo.Severity==LogSeverity.Error) - { - NoErrors++; - } - else if(logInfo.Severity==LogSeverity.Warning) - { - NoWarnings++; - } - else - { - NoMessages++; - } - if(logInfo.Severity==LogSeverity.Error && PauseOnError) - { - UnityEngine.Debug.Break(); - } - } - - public void Clear() - { - LogInfo.Clear(); - Channels.Clear(); - NoWarnings = 0; - NoErrors = 0; - NoMessages = 0; - } -} - -#endif diff --git a/Assets/UberLogger/UberLoggerEditor.cs.meta b/Assets/UberLogger/UberLoggerEditor.cs.meta deleted file mode 100644 index 2eecee363..000000000 --- a/Assets/UberLogger/UberLoggerEditor.cs.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 171c7ffd53d8144faa6b0cd0cb750235 -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: diff --git a/Assets/UberLogger/UberLoggerFile.cs b/Assets/UberLogger/UberLoggerFile.cs deleted file mode 100644 index 857ca05ca..000000000 --- a/Assets/UberLogger/UberLoggerFile.cs +++ /dev/null @@ -1,45 +0,0 @@ -// -using System.Collections; -using System.Collections.Generic; -using UberLogger; -using System.IO; -using UnityEngine; - -/// -/// A basic file logger backend -/// -public class UberLoggerFile : UberLogger.ILogger -{ - private StreamWriter LogFileWriter; - private bool IncludeCallStacks; - - /// - /// Constructor. Make sure to add it to UberLogger via Logger.AddLogger(); - /// filename is relative to Application.persistentDataPath - /// if includeCallStacks is true it will dump out the full callstack for all logs, at the expense of big log files. - /// - public UberLoggerFile(string filename, bool includeCallStacks = true) - { - IncludeCallStacks = includeCallStacks; - var fileLogPath = System.IO.Path.Combine(Application.persistentDataPath, filename); - Debug.Log("Initialising file logging to " + fileLogPath); - LogFileWriter = new StreamWriter(fileLogPath, false); - LogFileWriter.AutoFlush = true; - } - - public void Log(LogInfo logInfo) - { - lock(this) - { - LogFileWriter.WriteLine(logInfo.Message); - if(IncludeCallStacks && logInfo.Callstack.Count>0) - { - foreach(var frame in logInfo.Callstack) - { - LogFileWriter.WriteLine(frame.GetFormattedMethodName()); - } - LogFileWriter.WriteLine(); - } - } - } -} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index a3104b1ea..c76759f1f 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -74,7 +74,6 @@ PlayerSettings: ignoreAlphaClear: 0 xboxOneResolution: 0 xboxOneMonoLoggingLevel: 0 - xboxOneLoggingLevel: 1 ps3SplashScreen: {fileID: 0} videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 @@ -285,7 +284,6 @@ PlayerSettings: ps4PatchPkgPath: ps4PatchLatestPkgPath: ps4PatchChangeinfoPath: - ps4PatchDayOne: 0 ps4attribUserManagement: 0 ps4attribMoveSupport: 0 ps4attrib3DSupport: 0 @@ -382,7 +380,6 @@ PlayerSettings: tizenSigningProfileName: tizenGPSPermissions: 0 tizenMicrophonePermissions: 0 - tizenMinOSVersion: 0 n3dsUseExtSaveData: 0 n3dsCompressStaticMem: 1 n3dsExtSaveDataNumber: 0x12345 diff --git a/README.md b/README.md index 99988cb1f..748626beb 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,8 @@ are licensed under the MIT License and can be found here: Audio engine : FMOD by Firelight Technologies +Logger: Based on UnityDebugger by Valian (at ), modified source code available at + ## Contributing Please check the [CONTRIBUTING.md](CONTRIBUTING.md) file for contribution instructions and guidelines.