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

View File

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

View File

@ -1,35 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 1ccab43e933dced44b5709cd5dbcf8cc guid: 1ccab43e933dced44b5709cd5dbcf8cc
timeCreated: 1570482071
licenseType: Pro
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: - first:
: Any '': OSXIntel
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: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: AnyCPU
- first: - first:
: OSXIntel64 '': OSXIntel64
second: second:
enabled: 0 enabled: 0
settings: settings:
@ -42,11 +30,10 @@ PluginImporter:
- first: - first:
Editor: Editor Editor: Editor
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: AnyCPU CPU: x86
DefaultValueInitialized: true DefaultValueInitialized: true
OS: AnyOS
- first: - first:
Facebook: Win Facebook: Win
second: second:
@ -68,7 +55,7 @@ PluginImporter:
- first: - first:
Standalone: Linux64 Standalone: Linux64
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: None CPU: None
- first: - first:
@ -80,7 +67,7 @@ PluginImporter:
- first: - first:
Standalone: OSXUniversal Standalone: OSXUniversal
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: x86 CPU: x86
- first: - first:
@ -92,7 +79,7 @@ PluginImporter:
- first: - first:
Standalone: Win64 Standalone: Win64
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: None CPU: None
userData: userData:

View File

@ -1,35 +1,23 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: e6382e035030f2d4dac919d2484ec059 guid: e6382e035030f2d4dac919d2484ec059
timeCreated: 1570482072
licenseType: Pro
PluginImporter: PluginImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
iconMap: {} iconMap: {}
executionOrder: {} executionOrder: {}
defineConstraints: []
isPreloaded: 0 isPreloaded: 0
isOverridable: 0 isOverridable: 0
isExplicitlyReferenced: 0
validateReferences: 1
platformData: platformData:
- first: - first:
: Any '': OSXIntel
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: second:
enabled: 0 enabled: 0
settings: settings:
CPU: None CPU: None
- first: - first:
: OSXIntel64 '': OSXIntel64
second: second:
enabled: 1 enabled: 1
settings: settings:
@ -42,11 +30,10 @@ PluginImporter:
- first: - first:
Editor: Editor Editor: Editor
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: x86_64 CPU: x86_64
DefaultValueInitialized: true DefaultValueInitialized: true
OS: AnyOS
- first: - first:
Facebook: Win Facebook: Win
second: second:
@ -70,7 +57,7 @@ PluginImporter:
second: second:
enabled: 1 enabled: 1
settings: settings:
CPU: AnyCPU CPU: x86_64
- first: - first:
Standalone: LinuxUniversal Standalone: LinuxUniversal
second: second:
@ -80,13 +67,13 @@ PluginImporter:
- first: - first:
Standalone: OSXUniversal Standalone: OSXUniversal
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: x86_64 CPU: x86_64
- first: - first:
Standalone: Win Standalone: Win
second: second:
enabled: 1 enabled: 0
settings: settings:
CPU: None CPU: None
- first: - first:

View File

@ -1,7 +1,11 @@
using GCSeries.Core.Input; using GCSeries.Core.Input;
using HighlightPlus;
using QFramework; using QFramework;
using QFramework.Example; using QFramework.Example;
using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using Unity.Burst.CompilerServices;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using XMLTool; using XMLTool;
@ -102,7 +106,9 @@ public class DeviceController : MonoSingleton<DeviceController>
var uitip = UIKit.GetPanel<UIDeviceTip>(); var uitip = UIKit.GetPanel<UIDeviceTip>();
if (uitip != null) if (uitip != null)
{ {
uitip = UIKit.OpenPanel<UIDeviceTip>(UILevel.PopUI); UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().Start(this, () =>
{
});
} }
Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
RaycastHit hit; RaycastHit hit;

View File

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