This commit is contained in:
parent
87eae34f4b
commit
b3768a7aa8
|
@ -6,8 +6,9 @@ using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
|
||||||
|
#if UNITY_WINDOW
|
||||||
using AnotherFileBrowser.Windows;
|
using AnotherFileBrowser.Windows;
|
||||||
|
#endif
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
|
@ -29,6 +30,7 @@ namespace BITKit.IO
|
||||||
void AddListener(string key, Action<byte[]> action);
|
void AddListener(string key, Action<byte[]> action);
|
||||||
void RemoveListener(string key, Action<byte[]> action);
|
void RemoveListener(string key, Action<byte[]> action);
|
||||||
}
|
}
|
||||||
|
#if UNITY_WINDOW
|
||||||
[Serializable]
|
[Serializable]
|
||||||
public sealed class ApplicationFile:IApplicationFile
|
public sealed class ApplicationFile:IApplicationFile
|
||||||
{
|
{
|
||||||
|
@ -221,6 +223,7 @@ namespace BITKit.IO
|
||||||
void IApplicationFile.Reload()=>ReloadFile();
|
void IApplicationFile.Reload()=>ReloadFile();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
|
@ -9,6 +9,9 @@ namespace BITKit.UX
|
||||||
{
|
{
|
||||||
public class UXToolTips : MonoBehaviour
|
public class UXToolTips : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
[SerializeField]
|
||||||
|
[ReadOnly]
|
||||||
|
private string currentHoverName;
|
||||||
private VisualElement root;
|
private VisualElement root;
|
||||||
private Label label;
|
private Label label;
|
||||||
|
|
||||||
|
@ -51,10 +54,12 @@ namespace BITKit.UX
|
||||||
|
|
||||||
if (!EventSystem.current.IsPointerOverGameObject()) return "";
|
if (!EventSystem.current.IsPointerOverGameObject()) return "";
|
||||||
|
|
||||||
var screenPosition = Input.mousePosition;
|
var screenPosition = Mouse.current.position.ReadValue();
|
||||||
screenPosition.y = Screen.height - screenPosition.y;
|
screenPosition.y = Screen.height - screenPosition.y;
|
||||||
|
|
||||||
VisualElement ve = panel.Pick(RuntimePanelUtils.ScreenToPanel(panel, screenPosition));
|
VisualElement ve = panel.Pick(RuntimePanelUtils.ScreenToPanel(panel, screenPosition));
|
||||||
|
|
||||||
|
currentHoverName = ve?.name;
|
||||||
return ve == null ? "" : ve.tooltip;
|
return ve == null ? "" : ve.tooltip;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
@ -5,11 +6,33 @@ using BITKit;
|
||||||
using UnityEngine.UIElements;
|
using UnityEngine.UIElements;
|
||||||
using Cysharp.Threading.Tasks;
|
using Cysharp.Threading.Tasks;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
|
|
||||||
namespace BITKit.UX
|
namespace BITKit.UX
|
||||||
{
|
{
|
||||||
public sealed class UXDebuger : MonoBehaviour
|
public sealed class UXDebuger : MonoBehaviour
|
||||||
{
|
{
|
||||||
|
private readonly StringBuilder _logBuilder=new();
|
||||||
|
private void OnEnable()
|
||||||
|
{
|
||||||
|
Application.logMessageReceivedThreaded += OnLog;
|
||||||
|
}
|
||||||
|
private void OnDisable()
|
||||||
|
{
|
||||||
|
Application.logMessageReceivedThreaded -= OnLog;
|
||||||
|
}
|
||||||
|
private void OnLog(string condition, string stacktrace, LogType type)
|
||||||
|
{
|
||||||
|
_logBuilder.Append(condition);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void OnGUI()
|
||||||
|
{
|
||||||
|
GUILayout.BeginArea(new Rect(0, 0, Screen.width, Screen.height));
|
||||||
|
GUILayout.BeginVertical();
|
||||||
|
GUILayout.Label(_logBuilder.ToString());
|
||||||
|
GUILayout.EndVertical();
|
||||||
|
GUILayout.EndArea();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -2,7 +2,6 @@ using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Windows.Forms.VisualStyles;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UIElements;
|
using UnityEngine.UIElements;
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ using System.Collections.Generic;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
#if UNITY_5_3_OR_NEWER
|
#if UNITY_5_3_OR_NEWER && UNITY_WINDOW
|
||||||
using AnotherFileBrowser.Windows;
|
using AnotherFileBrowser.Windows;
|
||||||
#endif
|
#endif
|
||||||
using BITKit.Mod;
|
using BITKit.Mod;
|
||||||
|
@ -143,7 +143,7 @@ namespace BITKit.UX
|
||||||
return;
|
return;
|
||||||
void OpenModInternal()
|
void OpenModInternal()
|
||||||
{
|
{
|
||||||
#if UNITY_5_3_OR_NEWER
|
#if UNITY_5_3_OR_NEWER && UNITY_WINDOW
|
||||||
BIT4Log.Log<UXModService>("已进入文件对话框线程");
|
BIT4Log.Log<UXModService>("已进入文件对话框线程");
|
||||||
new FileBrowser().OpenFileBrowser(new BrowserProperties()
|
new FileBrowser().OpenFileBrowser(new BrowserProperties()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue