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 90% rename from Assets/GCSeries/Core/Plugins/x86/zCoreUnity.dll.meta rename to Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll.meta index 92acab1f..5b13052b 100644 --- a/Assets/GCSeries/Core/Plugins/x86/zCoreUnity.dll.meta +++ b/Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll.meta @@ -5,11 +5,14 @@ PluginImporter: serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: - '': Any + : Any second: enabled: 0 settings: @@ -19,17 +22,17 @@ PluginImporter: Exclude Linux64: 0 Exclude LinuxUniversal: 0 Exclude OSXUniversal: 0 - Exclude WebGL: 0 + Exclude WebGL: 1 Exclude Win: 0 Exclude Win64: 1 - first: - '': OSXIntel + : OSXIntel second: enabled: 1 settings: CPU: AnyCPU - first: - '': OSXIntel64 + : OSXIntel64 second: enabled: 0 settings: @@ -50,7 +53,7 @@ PluginImporter: second: enabled: 1 settings: - CPU: x86 + CPU: AnyCPU DefaultValueInitialized: true OS: AnyOS - first: @@ -104,7 +107,7 @@ PluginImporter: - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} userData: assetBundleName: diff --git a/Assets/GCSeries/Core/Plugins/x86_64/zCoreUnity.dll.meta b/Assets/GCSeries/Core/Plugins/x86_64/zCoreUnity.dll.meta index 22c5b9c9..575b6a1b 100644 --- a/Assets/GCSeries/Core/Plugins/x86_64/zCoreUnity.dll.meta +++ b/Assets/GCSeries/Core/Plugins/x86_64/zCoreUnity.dll.meta @@ -5,11 +5,14 @@ PluginImporter: serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: - '': Any + : Any second: enabled: 0 settings: @@ -19,17 +22,17 @@ PluginImporter: Exclude Linux64: 0 Exclude LinuxUniversal: 0 Exclude OSXUniversal: 0 - Exclude WebGL: 0 + Exclude WebGL: 1 Exclude Win: 1 Exclude Win64: 0 - first: - '': OSXIntel + : OSXIntel second: enabled: 0 settings: CPU: None - first: - '': OSXIntel64 + : OSXIntel64 second: enabled: 1 settings: @@ -76,7 +79,7 @@ PluginImporter: second: enabled: 1 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: LinuxUniversal second: @@ -104,7 +107,7 @@ PluginImporter: - first: WebGL: WebGL second: - enabled: 1 + enabled: 0 settings: {} userData: assetBundleName: 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 75% rename from Assets/GCSeries/zView/Plugins/x86/zViewUnity.dll.meta rename to Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll.meta index d10f7269..e3ab6f3d 100644 --- a/Assets/GCSeries/zView/Plugins/x86/zViewUnity.dll.meta +++ b/Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll.meta @@ -1,23 +1,35 @@ fileFormatVersion: 2 guid: 1ccab43e933dced44b5709cd5dbcf8cc -timeCreated: 1570482071 -licenseType: Pro PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: - '': OSXIntel + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 1 + Exclude Win: 0 + Exclude Win64: 0 + - first: + : OSXIntel second: enabled: 1 settings: CPU: AnyCPU - first: - '': OSXIntel64 + : OSXIntel64 second: enabled: 0 settings: @@ -30,10 +42,11 @@ PluginImporter: - first: Editor: Editor second: - enabled: 0 + enabled: 1 settings: - CPU: x86 + CPU: AnyCPU DefaultValueInitialized: true + OS: AnyOS - first: Facebook: Win second: @@ -55,7 +68,7 @@ PluginImporter: - first: Standalone: Linux64 second: - enabled: 0 + enabled: 1 settings: CPU: None - first: @@ -67,7 +80,7 @@ PluginImporter: - first: Standalone: OSXUniversal second: - enabled: 0 + enabled: 1 settings: CPU: x86 - first: @@ -79,7 +92,7 @@ PluginImporter: - first: Standalone: Win64 second: - enabled: 0 + enabled: 1 settings: CPU: None userData: diff --git a/Assets/GCSeries/zView/Plugins/x86_64/zViewUnity.dll.meta b/Assets/GCSeries/zView/Plugins/x86_64/zViewUnity.dll.meta index 0e91e765..f059785e 100644 --- a/Assets/GCSeries/zView/Plugins/x86_64/zViewUnity.dll.meta +++ b/Assets/GCSeries/zView/Plugins/x86_64/zViewUnity.dll.meta @@ -1,23 +1,35 @@ fileFormatVersion: 2 guid: e6382e035030f2d4dac919d2484ec059 -timeCreated: 1570482072 -licenseType: Pro PluginImporter: externalObjects: {} serializedVersion: 2 iconMap: {} executionOrder: {} + defineConstraints: [] isPreloaded: 0 isOverridable: 0 + isExplicitlyReferenced: 0 + validateReferences: 1 platformData: - first: - '': OSXIntel + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 0 + Exclude WebGL: 1 + Exclude Win: 0 + Exclude Win64: 0 + - first: + : OSXIntel second: enabled: 0 settings: CPU: None - first: - '': OSXIntel64 + : OSXIntel64 second: enabled: 1 settings: @@ -30,10 +42,11 @@ PluginImporter: - first: Editor: Editor second: - enabled: 0 + enabled: 1 settings: CPU: x86_64 DefaultValueInitialized: true + OS: AnyOS - first: Facebook: Win second: @@ -57,7 +70,7 @@ PluginImporter: second: enabled: 1 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: LinuxUniversal second: @@ -67,13 +80,13 @@ PluginImporter: - first: Standalone: OSXUniversal second: - enabled: 0 + enabled: 1 settings: CPU: x86_64 - first: Standalone: Win second: - enabled: 0 + enabled: 1 settings: CPU: None - first: diff --git a/Assets/Scripts/Controller/DeviceController.cs b/Assets/Scripts/Controller/DeviceController.cs index f1fbe328..b8095454 100644 --- a/Assets/Scripts/Controller/DeviceController.cs +++ b/Assets/Scripts/Controller/DeviceController.cs @@ -1,11 +1,7 @@ using GCSeries.Core.Input; -using HighlightPlus; using QFramework; using QFramework.Example; -using System; -using System.Collections; using System.Collections.Generic; -using Unity.Burst.CompilerServices; using UnityEngine; using UnityEngine.EventSystems; using XMLTool; @@ -48,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(); } } @@ -104,12 +100,6 @@ public class DeviceController : MonoSingleton { #if !VR var uitip = UIKit.GetPanel(); - if (uitip != null) - { - UIKit.OpenPanelAsync(UILevel.PopUI).ToAction().Start(this, () => - { - }); - } Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); RaycastHit hit; if (Physics.Raycast(ray, out hit)) @@ -118,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 ddb1f728..b9908b77 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,24 +59,24 @@ public class TipItem : MonoBehaviour tip = UIKit.GetPanel(); if (tip == null) { - UIKit.OpenPanelAsync(UILevel.PopUI).ToAction().Start(this, () => + UIKit.OpenPanelAsync(UILevel.PopUI).ToAction().StartGlobal(() => { tip = UIKit.GetPanel(); - tip.Set(label); - tip.Active(true); + 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(); } } @@ -89,7 +89,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()