勘误两个模块内容

Merge remote-tracking branch 'origin/master' into AnHui_BaoShi
删除多余日志
2025-03-27 15:48:29 +08:00 · 2025-03-27 15:09:23 +08:00 · 2025-03-27 13:15:19 +08:00 · 2025-03-27 13:14:48 +08:00 · 2025-03-27 10:16:08 +08:00 · 2025-03-27 10:09:37 +08:00
12 changed files with 96 additions and 64 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,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: 
--- 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: 
--- 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,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: 
--- 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:
--- 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<DeviceController>
            }
            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<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))
@ -118,12 +108,12 @@ public class DeviceController : MonoSingleton<DeviceController>

            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)
--- 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<UIDeviceTip>();
        if (tip == null)
        {
-            UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().Start(this, () =>
+            UIKit.OpenPanelAsync<UIDeviceTip>(UILevel.PopUI).ToAction().StartGlobal(() =>
            {
                tip = UIKit.GetPanel<UIDeviceTip>();
-                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();
        }
    }
 }
--- a/Assets/Scripts/Launch.cs
+++ b/Assets/Scripts/Launch.cs
@ -41,6 +41,8 @@ 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,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()
--- a/Data/Xml/BaoShiZhuoMoJiaGong.xml
+++ b/Data/Xml/BaoShiZhuoMoJiaGong.xml
@ -1061,8 +1061,11 @@

          <!--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>
@ -1305,6 +1308,7 @@

            <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 (1)"  isShow="true" ></Action>
+          <Action type="Show" value="TargerObjets/SM_MiDuYi"  isShow="true" ></Action>

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

-          <Action type="HighLightFlash" value="TargerObjets/SM_MiDuYi (1)" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
+          <Action type="HighLightFlash" value="TargerObjets/SM_MiDuYi" 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 (1)" isHigh="false" color="255,0,0,255"></Action>
+          <Action type="HighLightFlash" value="TargerObjets/SM_MiDuYi" isHigh="false" color="255,0,0,255"></Action>
          <Action type="StrEvent" name="HighLightTrigger" value="true"></Action>
Author	SHA1	Message	Date
Lihao7788	0c7743423c	勘误两个模块内容	2025-03-27 15:48:29 +08:00
Lihao7788	de5bfbff80	Merge remote-tracking branch 'origin/master' into AnHui_BaoShi	2025-03-27 15:09:23 +08:00
shenjianxing	4591b00ea0	删除多余日志	2025-03-27 13:15:19 +08:00
shenjianxing	41c68a734a	修复web平台兼容性问题	2025-03-27 13:14:48 +08:00
shenjianxing	b7c053dd0c	修复bug	2025-03-27 10:16:08 +08:00
shenjianxing	a8c7c1ed62	还远文件大小写	2025-03-27 10:09:37 +08:00
shenjianxing	783fc2c4dd	修改文件大小写	2025-03-27 10:09:22 +08:00