diff --git a/Assets/GCSeries/Core/Plugins/x86/zCoreUnity.dll b/Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll similarity index 100% rename from Assets/GCSeries/Core/Plugins/x86/zCoreUnity.dll rename to Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll diff --git a/Assets/GCSeries/Core/Plugins/x86/zCoreUnity.dll.meta b/Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll.meta similarity index 100% rename from Assets/GCSeries/Core/Plugins/x86/zCoreUnity.dll.meta rename to Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll.meta diff --git a/Assets/GCSeries/zView/Plugins/x86/zViewUnity.dll b/Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll similarity index 100% rename from Assets/GCSeries/zView/Plugins/x86/zViewUnity.dll rename to Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll diff --git a/Assets/GCSeries/zView/Plugins/x86/zViewUnity.dll.meta b/Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll.meta similarity index 100% rename from Assets/GCSeries/zView/Plugins/x86/zViewUnity.dll.meta rename to Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll.meta diff --git a/Assets/Scripts/Controller/DeviceController.cs b/Assets/Scripts/Controller/DeviceController.cs index 9514995f..b8095454 100644 --- a/Assets/Scripts/Controller/DeviceController.cs +++ b/Assets/Scripts/Controller/DeviceController.cs @@ -44,14 +44,14 @@ public class DeviceController : MonoSingleton } if (uitip != null) { - uitip.Set(deviceItem.tipItem.label); - uitip.Active(true); + uitip.Open(new UIDeviceTipData() { txt = deviceItem.tipItem.label }); + uitip.Show(); return; } } else { - uitip?.Active(false); + uitip?.Hide(); } } @@ -100,10 +100,6 @@ public class DeviceController : MonoSingleton { #if !VR var uitip = UIKit.GetPanel(); - if (uitip != null) - { - uitip = UIKit.OpenPanel(UILevel.PopUI); - } Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); RaycastHit hit; if (Physics.Raycast(ray, out hit)) @@ -112,12 +108,12 @@ public class DeviceController : MonoSingleton if (uitip != null && deviceItem != null && deviceItem.tipItem != null && EventSystem.current.IsPointerOverGameObject() == false) { - uitip.Set(deviceItem.tipItem.label); - uitip.Active(true); + uitip.Open(new UIDeviceTipData() { txt = deviceItem.tipItem.label }); + uitip.Show(); return; } } - uitip?.Active(false); + uitip?.Hide(); #endif } public DeviceItem GetDeviceItem(string name) diff --git a/Assets/Scripts/Item/TipItem.cs b/Assets/Scripts/Item/TipItem.cs index 5060fb14..3ffeaaec 100644 --- a/Assets/Scripts/Item/TipItem.cs +++ b/Assets/Scripts/Item/TipItem.cs @@ -28,7 +28,7 @@ public class TipItem : MonoBehaviour { if (tip != null) { - tip.Active(false); + tip.Hide(); } } } @@ -59,22 +59,25 @@ public class TipItem : MonoBehaviour tip = UIKit.GetPanel(); if (tip == null) { - tip = UIKit.OpenPanel(UILevel.PopUI); - - tip.Set(label); - tip.Active(true); + Debug.LogError($"{gameObject}:Tip"); + UIKit.OpenPanelAsync(UILevel.PopUI).ToAction().StartGlobal(() => + { + tip = UIKit.GetPanel(); + tip.Open(new UIDeviceTipData() { txt = label }); + tip.Show(); + }); } else { - tip.Set(label); - tip.Active(true); + tip.Open(new UIDeviceTipData() { txt = label}); + tip.Show(); } } public void OnExit() { if (tip != null) { - tip.Active(false); + tip.Hide(); } } @@ -87,7 +90,7 @@ public class TipItem : MonoBehaviour { if (tip != null) { - tip.Active(false); + tip.Hide(); } } } diff --git a/Assets/Scripts/Launch.cs b/Assets/Scripts/Launch.cs index acfb8991..2e0049e4 100644 --- a/Assets/Scripts/Launch.cs +++ b/Assets/Scripts/Launch.cs @@ -41,6 +41,8 @@ public class Launch : MonoBehaviour }); yield return UIKit.OpenPanelAsync(); + yield return UIKit.OpenPanelAsync(canvasLevel: UILevel.PopUI); + UIKit.GetPanel().Hide(); yield return new WaitUntil(() => isLoadFinished == true); if (Global.Instance.appData.preLoad != null && Global.Instance.appData.preLoad.action != null) { diff --git a/Assets/Scripts/UI/UIDeviceTip.cs b/Assets/Scripts/UI/UIDeviceTip.cs index bdbad4ad..8b0b09d9 100644 --- a/Assets/Scripts/UI/UIDeviceTip.cs +++ b/Assets/Scripts/UI/UIDeviceTip.cs @@ -8,6 +8,7 @@ namespace QFramework.Example { public class UIDeviceTipData : UIPanelData { + public string txt; } public partial class UIDeviceTip : UIPanel { @@ -20,6 +21,11 @@ namespace QFramework.Example protected override void OnOpen(IUIData uiData = null) { + if (uiData != null) + { + mData = uiData as UIDeviceTipData ?? new UIDeviceTipData(); + Label.text = Regex.Replace(mData.txt, @"\\n", "\n"); + } } #if !VR @@ -33,21 +39,19 @@ namespace QFramework.Example } #endif - public void Set(string txt) - { - Label.text = Regex.Replace(txt, @"\\n", "\n"); - } - public void Active(bool active) - { - Point.gameObject.SetActive(active); - } + //public void Active(bool active) + //{ + // Point.gameObject.SetActive(active); + //} protected override void OnShow() { + //Active(true); } protected override void OnHide() { + //Active(false); } protected override void OnClose()