Merge branch 'master' of https://github.com/ExpressoBits/EBConsole

Author: scriptsengineer

Runtime/Prefabs/UI/Console Logs.prefab

@@ -180,7 +180,7 @@ MonoBehaviour:
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 1
-  m_ChildControlHeight: 0
+  m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
 --- !u!1 &2521465565712712062
@@ -328,10 +328,9 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 2521465566147303949}
-  - component: {fileID: 2521465566147303951}
-  - component: {fileID: 2521465566147303950}
   - component: {fileID: 2521465566147303945}
   - component: {fileID: 677332926}
+  - component: {fileID: 8391089249524133000}
   m_Layer: 0
   m_Name: Panel Log Toast
   m_TagString: Untagged
@@ -353,39 +352,11 @@ RectTransform:
   m_Father: {fileID: 2521465566045791799}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &2521465566147303951
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2521465566147303954}
-  m_CullTransparentMesh: 0
---- !u!114 &2521465566147303950
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2521465566147303954}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 0
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: 256
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!114 &2521465566147303945
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -408,7 +379,7 @@ MonoBehaviour:
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 0
   m_ChildControlWidth: 1
-  m_ChildControlHeight: 0
+  m_ChildControlHeight: 1
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
 --- !u!114 &677332926
@@ -423,6 +394,20 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &8391089249524133000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2521465566147303954}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 1
 --- !u!1 &2521465566244532597
 GameObject:
   m_ObjectHideFlags: 0

Runtime/Prefabs/UI/Visual Stater.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 895347982646669796}
   - component: {fileID: 1810027412}
   - component: {fileID: 627649272241792315}
+  - component: {fileID: 815598469168566691}
   m_Layer: 0
   m_Name: Visual Stater
   m_TagString: Untagged
@@ -33,11 +34,11 @@ RectTransform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_SizeDelta: {x: 0, y: 512}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &895347982646669796
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -84,3 +85,17 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   infoMessagePrefab: {fileID: 573168610, guid: 6572eec04479f7d49968db9fe3f91873, type: 3}
+--- !u!114 &815598469168566691
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 895347982646669795}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 0

Runtime/Scripts/UI/VisualConsoler.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -134,17 +135,22 @@ public bool IsEnableInput()
 
         public InfoMessage InstantiateLogsAndReturnToastLog(Info info,float timer)
         {
+
             var toastLog = Instantiate(uiLogPrefab, m_LogPanel.logPanelToast.transform);
             if(align == ConsoleAlign.Top)toastLog.transform.SetSiblingIndex(0);
 
-            toastLog.Setup(info,timer);
-
+            toastLog.Setup(info,8f);
+            
             if (!Consoler.Instance.Commander) return toastLog;
             var staticLog = Instantiate(uiLogPrefab, m_LogPanel.logScrollContent.transform);
             if(align == ConsoleAlign.Top)staticLog.transform.SetSiblingIndex(0);
             staticLog.Setup(info);
+
+
             return staticLog;
 
+            
+
         }
     }
 

Tests/Scene/Demo.unity

@@ -1720,7 +1720,7 @@ Canvas:
   m_RenderMode: 0
   m_Camera: {fileID: 0}
   m_PlaneDistance: 100
-  m_PixelPerfect: 1
+  m_PixelPerfect: 0
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0