Compare commits

..

No commits in common. "49b678288c13178a328c35e47ffe4db98146fdbe" and "f77a2e4f52ae68d52f482882730fd0e8a62ca36d" have entirely different histories.

6 changed files with 42 additions and 66 deletions

View File

@ -5,14 +5,11 @@ PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
'': Any
second:
enabled: 0
settings:
@ -22,17 +19,17 @@ PluginImporter:
Exclude Linux64: 0
Exclude LinuxUniversal: 0
Exclude OSXUniversal: 0
Exclude WebGL: 1
Exclude WebGL: 0
Exclude Win: 0
Exclude Win64: 1
- first:
: OSXIntel
'': OSXIntel
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
: OSXIntel64
'': OSXIntel64
second:
enabled: 0
settings:
@ -53,7 +50,7 @@ PluginImporter:
second:
enabled: 1
settings:
CPU: AnyCPU
CPU: x86
DefaultValueInitialized: true
OS: AnyOS
- first:
@ -107,7 +104,7 @@ PluginImporter:
- first:
WebGL: WebGL
second:
enabled: 0
enabled: 1
settings: {}
userData:
assetBundleName:

View File

@ -5,14 +5,11 @@ PluginImporter:
serializedVersion: 2
iconMap: {}
executionOrder: {}
defineConstraints: []
isPreloaded: 0
isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData:
- first:
: Any
'': Any
second:
enabled: 0
settings:
@ -22,17 +19,17 @@ PluginImporter:
Exclude Linux64: 0
Exclude LinuxUniversal: 0
Exclude OSXUniversal: 0
Exclude WebGL: 1
Exclude WebGL: 0
Exclude Win: 1
Exclude Win64: 0
- first:
: OSXIntel
'': OSXIntel
second:
enabled: 0
settings:
CPU: None
- first:
: OSXIntel64
'': OSXIntel64
second:
enabled: 1
settings:
@ -79,7 +76,7 @@ PluginImporter:
second:
enabled: 1
settings:
CPU: AnyCPU
CPU: x86_64
- first:
Standalone: LinuxUniversal
second:
@ -107,7 +104,7 @@ PluginImporter:
- first:
WebGL: WebGL
second:
enabled: 0
enabled: 1
settings: {}
userData:
assetBundleName:

View File

@ -1,35 +1,23 @@
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:
: 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
'': OSXIntel
second:
enabled: 1
settings:
CPU: AnyCPU
- first:
: OSXIntel64
'': OSXIntel64
second:
enabled: 0
settings:
@ -42,11 +30,10 @@ PluginImporter:
- first:
Editor: Editor
second:
enabled: 1
enabled: 0
settings:
CPU: AnyCPU
CPU: x86
DefaultValueInitialized: true
OS: AnyOS
- first:
Facebook: Win
second:
@ -68,7 +55,7 @@ PluginImporter:
- first:
Standalone: Linux64
second:
enabled: 1
enabled: 0
settings:
CPU: None
- first:
@ -80,7 +67,7 @@ PluginImporter:
- first:
Standalone: OSXUniversal
second:
enabled: 1
enabled: 0
settings:
CPU: x86
- first:
@ -92,7 +79,7 @@ PluginImporter:
- first:
Standalone: Win64
second:
enabled: 1
enabled: 0
settings:
CPU: None
userData:

View File

@ -1,35 +1,23 @@
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:
: 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
'': OSXIntel
second:
enabled: 0
settings:
CPU: None
- first:
: OSXIntel64
'': OSXIntel64
second:
enabled: 1
settings:
@ -42,11 +30,10 @@ PluginImporter:
- first:
Editor: Editor
second:
enabled: 1
enabled: 0
settings:
CPU: x86_64
DefaultValueInitialized: true
OS: AnyOS
- first:
Facebook: Win
second:
@ -70,7 +57,7 @@ PluginImporter:
second:
enabled: 1
settings:
CPU: AnyCPU
CPU: x86_64
- first:
Standalone: LinuxUniversal
second:
@ -80,13 +67,13 @@ PluginImporter:
- first:
Standalone: OSXUniversal
second:
enabled: 1
enabled: 0
settings:
CPU: x86_64
- first:
Standalone: Win
second:
enabled: 1
enabled: 0
settings:
CPU: None
- first:

View File

@ -1,7 +1,11 @@
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;
@ -102,7 +106,9 @@ public class DeviceController : MonoSingleton<DeviceController>
var uitip = UIKit.GetPanel<UIDeviceTip>();
if (uitip != null)
{
uitip = UIKit.OpenPanel<UIDeviceTip>(UILevel.PopUI);
UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().Start(this, () =>
{
});
}
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit;

View File

@ -59,10 +59,12 @@ public class TipItem : MonoBehaviour
tip = UIKit.GetPanel<UIDeviceTip>();
if (tip == null)
{
tip = UIKit.OpenPanel<UIDeviceTip>(UILevel.PopUI);
tip.Set(label);
tip.Active(true);
UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().Start(this, () =>
{
tip = UIKit.GetPanel<UIDeviceTip>();
tip.Set(label);
tip.Active(true);
});
}
else
{