diff --git a/AssetBundles/debug b/AssetBundles/debug index abcb4b9e..f50e124a 100644 Binary files a/AssetBundles/debug and b/AssetBundles/debug differ diff --git a/AssetBundles/debug.manifest b/AssetBundles/debug.manifest index ec153352..c67ea6f4 100644 --- a/AssetBundles/debug.manifest +++ b/AssetBundles/debug.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 1039691058 +CRC: 2815158869 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 09f9f4f247158b6c3e422fc20dae56a0 + Hash: b0dab33ce9502b8c920c956269fa585e TypeTreeHash: serializedVersion: 2 - Hash: 737950008f8470fd33adbb15e41f47ec + Hash: 4d6a73cb377370ba69c96eb5da1b5028 HashAppended: 0 ClassTypes: - Class: 1 @@ -19,8 +19,6 @@ ClassTypes: Script: {instanceID: 0} - Class: 114 Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} -- Class: 114 - Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - Class: 114 Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - Class: 115 diff --git a/AssetBundles/network.manifest b/AssetBundles/network.manifest index 5f928af7..ff82f9e2 100644 --- a/AssetBundles/network.manifest +++ b/AssetBundles/network.manifest @@ -3,7 +3,7 @@ CRC: 561788810 Hashes: AssetFileHash: serializedVersion: 2 - Hash: bde832827d2a891a56083d4ec38bfb92 + Hash: 2ed408e0c9f6147e341c9606eb7228c3 TypeTreeHash: serializedVersion: 2 Hash: 47ee499ae8022a6b96ca6a5fd541f154 diff --git a/QSB/Utility/DebugLog.cs b/QSB/Utility/DebugLog.cs index b00926f8..e6c2cfac 100644 --- a/QSB/Utility/DebugLog.cs +++ b/QSB/Utility/DebugLog.cs @@ -46,20 +46,20 @@ namespace QSB.Utility public static void ToScreen(params object[] logObjects) { + /* for (var i = 1; i < ScreenLinesMax; i++) { _lines[i - 1] = _lines[i]; } _lines.Insert(ScreenLinesMax - 1, JoinAll(logObjects)); _screenText.text = string.Join("\n", _lines.ToArray()); + */ } public static void ToHud(params object[] logObjects) { if (Locator.GetPlayerBody() == null) { - //ToConsole("Warning: tried to log to HUD but player is not ready."); - //ToConsole("* " + JoinAll(logObjects)); return; } var data = new NotificationData(NotificationTarget.Player, JoinAll(logObjects)); diff --git a/UnityProject/Assets/LogCanvas.prefab b/UnityProject/Assets/LogCanvas.prefab index ad49bebf..b40c2c8c 100644 --- a/UnityProject/Assets/LogCanvas.prefab +++ b/UnityProject/Assets/LogCanvas.prefab @@ -9,18 +9,18 @@ Prefab: m_Modifications: [] m_RemovedComponents: [] m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1665593117323046} + m_RootGameObject: {fileID: 1903551149170608} m_IsPrefabParent: 1 ---- !u!1 &1023481920206624 +--- !u!1 &1404529727000012 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224743063540195292} - - component: {fileID: 222696681738490042} - - component: {fileID: 114896410086059888} + - component: {fileID: 224538486460784708} + - component: {fileID: 222986556089560310} + - component: {fileID: 114038938687489096} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -28,17 +28,16 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!1 &1665593117323046 +--- !u!1 &1903551149170608 GameObject: m_ObjectHideFlags: 0 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 5 m_Component: - - component: {fileID: 224609637965221496} - - component: {fileID: 223860320413469712} - - component: {fileID: 114297604184959058} - - component: {fileID: 114637585275854172} + - component: {fileID: 224105012127347782} + - component: {fileID: 223566299370351722} + - component: {fileID: 114338821582470422} m_Layer: 5 m_Name: LogCanvas m_TagString: Untagged @@ -46,49 +45,12 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &114297604184959058 +--- !u!114 &114038938687489096 MonoBehaviour: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1665593117323046} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 ---- !u!114 &114637585275854172 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1665593117323046} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &114896410086059888 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1023481920206624} + m_GameObject: {fileID: 1404529727000012} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -96,7 +58,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -116,18 +78,39 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: ---- !u!222 &222696681738490042 +--- !u!114 &114338821582470422 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1903551149170608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!222 &222986556089560310 CanvasRenderer: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1023481920206624} ---- !u!223 &223860320413469712 + m_GameObject: {fileID: 1404529727000012} +--- !u!223 &223566299370351722 Canvas: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1665593117323046} + m_GameObject: {fileID: 1903551149170608} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 0 @@ -140,19 +123,19 @@ Canvas: m_SortingBucketNormalizedSize: 0 m_AdditionalShaderChannelsFlag: 0 m_SortingLayerID: 0 - m_SortingOrder: 0 + m_SortingOrder: -1 m_TargetDisplay: 0 ---- !u!224 &224609637965221496 +--- !u!224 &224105012127347782 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1665593117323046} + m_GameObject: {fileID: 1903551149170608} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 224743063540195292} + - {fileID: 224538486460784708} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -161,17 +144,17 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!224 &224743063540195292 +--- !u!224 &224538486460784708 RectTransform: m_ObjectHideFlags: 1 m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1023481920206624} + m_GameObject: {fileID: 1404529727000012} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 224609637965221496} + m_Father: {fileID: 224105012127347782} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0}