12 changed files with 64 additions and 96 deletions
--- a/Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll
+++ b/Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll
--- a/Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll.meta
+++ b/Assets/GCSeries/Core/Plugins/x86/zCoreUnity_86.dll.meta
@ -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: 
--- a/Assets/GCSeries/Core/Plugins/x86_64/zCoreUnity.dll.meta
+++ b/Assets/GCSeries/Core/Plugins/x86_64/zCoreUnity.dll.meta
@ -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: 
--- a/Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll
+++ b/Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll
--- a/Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll.meta
+++ b/Assets/GCSeries/zView/Plugins/x86/zViewUnity_86.dll.meta
@ -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: 
--- a/Assets/GCSeries/zView/Plugins/x86_64/zViewUnity.dll.meta
+++ b/Assets/GCSeries/zView/Plugins/x86_64/zViewUnity.dll.meta
@ -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:
--- a/Assets/Scripts/Controller/DeviceController.cs
+++ b/Assets/Scripts/Controller/DeviceController.cs
@ -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;
@ -44,14 +48,14 @@ public class DeviceController : MonoSingleton<DeviceController>
            }
            if (uitip != null)
            {
-                uitip.Open(new UIDeviceTipData() { txt = deviceItem.tipItem.label });
-                uitip.Show();
+                uitip.Set(deviceItem.tipItem.label);
+                uitip.Active(true);
                return;
            }
        }
        else
        {
-            uitip?.Hide();
+            uitip?.Active(false);
        }

    }
@ -100,6 +104,12 @@ public class DeviceController : MonoSingleton<DeviceController>
    {
 #if !VR
        var uitip = UIKit.GetPanel<UIDeviceTip>();
+        if (uitip != null)
+        {
+            UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().Start(this, () =>
+            {
+            });
+        }
        Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition);
        RaycastHit hit;
        if (Physics.Raycast(ray, out hit))
@ -108,12 +118,12 @@ public class DeviceController : MonoSingleton<DeviceController>

            if (uitip != null && deviceItem != null && deviceItem.tipItem != null && EventSystem.current.IsPointerOverGameObject() == false)
            {
-                uitip.Open(new UIDeviceTipData() { txt = deviceItem.tipItem.label });
-                uitip.Show();
+                uitip.Set(deviceItem.tipItem.label);
+                uitip.Active(true);
                return;
            }
        }
-        uitip?.Hide();
+        uitip?.Active(false);
 #endif
    }
    public DeviceItem GetDeviceItem(string name)
--- a/Assets/Scripts/Item/TipItem.cs
+++ b/Assets/Scripts/Item/TipItem.cs
@ -28,7 +28,7 @@ public class TipItem : MonoBehaviour
        {
            if (tip != null)
            {
-                tip.Hide();
+                tip.Active(false);
            }
        }
    }
@ -59,24 +59,24 @@ public class TipItem : MonoBehaviour
        tip = UIKit.GetPanel<UIDeviceTip>();
        if (tip == null)
        {
-            UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().StartGlobal(() =>
+            UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().Start(this, () =>
            {
                tip = UIKit.GetPanel<UIDeviceTip>();
-                tip.Open(new UIDeviceTipData() { txt = label });
-                tip.Show();
+                tip.Set(label);
+                tip.Active(true);
            });
        }
        else
        {
-            tip.Open(new UIDeviceTipData() { txt = label});
-            tip.Show();
+            tip.Set(label);
+            tip.Active(true);
        }
    }
    public void OnExit()
    {
        if (tip != null)
        {
-            tip.Hide();
+            tip.Active(false);
        }
    }

@ -89,7 +89,7 @@ public class TipItem : MonoBehaviour
    {
        if (tip != null)
        {
-            tip.Hide();
+            tip.Active(false);
        }
    }
 }
--- a/Assets/Scripts/Launch.cs
+++ b/Assets/Scripts/Launch.cs
@ -41,8 +41,6 @@ public class Launch : MonoBehaviour
        });

        yield return UIKit.OpenPanelAsync<UILoading>();
-        yield return UIKit.OpenPanelAsync<UIDeviceTip>(canvasLevel: UILevel.PopUI);
-        UIKit.GetPanel<UIDeviceTip>().Hide();
        yield return new WaitUntil(() => isLoadFinished == true);
        if (Global.Instance.appData.preLoad != null && Global.Instance.appData.preLoad.action != null)
        {
--- a/Assets/Scripts/UI/UIDeviceTip.cs
+++ b/Assets/Scripts/UI/UIDeviceTip.cs
@ -8,7 +8,6 @@ namespace QFramework.Example
 {
    public class UIDeviceTipData : UIPanelData
    {
-        public string txt;
    }
    public partial class UIDeviceTip : UIPanel
    {
@ -21,11 +20,6 @@ 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
@ -39,19 +33,21 @@ namespace QFramework.Example
        }
 #endif

-        //public void Active(bool active)
-        //{
-        //    Point.gameObject.SetActive(active);
-        //}
+        public void Set(string txt)
+        {
+            Label.text = Regex.Replace(txt, @"\\n", "\n");
+        }
+        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()
--- a/Data/Xml/BaoShiZhuoMoJiaGong.xml
+++ b/Data/Xml/BaoShiZhuoMoJiaGong.xml
@ -1061,11 +1061,8 @@

          <!--V形粘杆 酒精灯然受取下 粘胶和宝石，平头粘竿进行制作-->
          <Action type="Sequence">
-       
-            
            <Action type="Hint" value="请选择合适的工具，制作粘杆，将宝石坯子粘在粘杆上" time="-1" audio="sound_122.mp3" icon="true" ></Action>

-            <Action type="Show" value="Main/SM_YanMoJi/SM_JiuJingDeng" isShow="true"></Action>
            <!--相机视角-->
            <Action type="Move" value="FlyCamera" to="-2.017345,1.291999,-3.254362" time="0"></Action>
            <Action type="Rotate" value="FlyCamera" to="24.762,-176.761,0" time="0"></Action>
@ -1308,7 +1305,6 @@

            <Action type="SetScore" name="宝石琢磨加工10.脱胶清洗" value="10"></Action>
            <!--酒精灯 烤软粘竿，镊子取下宝石，放入容器中进行清洗，然后取出-->
-            <Action type="Show" value="Main/SM_YanMoJi/SM_JiuJingDeng" isShow="true"></Action>
            <Action type="TimeLine" value="TimeLines/TuoJiaoQingXi" isShow="true" finishedEvent="播放完毕" isWait="true" frame="0" endFrame="400"></Action>

            <Action type="TipWindow" value="恭喜你完成当前模块 得分:{Score}" btns="确定" ></Action>
--- a/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml
+++ b/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml
@ -393,13 +393,13 @@

          <!--<Action type="Move" value="FlyCamera" to="-0.06743907,1.365368,2.151958" time="0"></Action>
          <Action type="Rotate" value="FlyCamera" to="20.97371,358.8721,1.428679E-08" time="0"></Action>-->
-          <Action type="Show" value="TargerObjets/SM_MiDuYi"  isShow="true" ></Action>
+          <Action type="Show" value="TargerObjets/SM_MiDuYi (1)"  isShow="true" ></Action>

          <Action type="StrEvent" name="HighLightTrigger" value="false"></Action>

-          <Action type="HighLightFlash" value="TargerObjets/SM_MiDuYi" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
+          <Action type="HighLightFlash" value="TargerObjets/SM_MiDuYi (1)" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
          <Action type="Delay" value="2"></Action>
-          <Action type="HighLightFlash" value="TargerObjets/SM_MiDuYi" isHigh="false" color="255,0,0,255"></Action>
+          <Action type="HighLightFlash" value="TargerObjets/SM_MiDuYi (1)" isHigh="false" color="255,0,0,255"></Action>
          <Action type="StrEvent" name="HighLightTrigger" value="true"></Action>