From 07968c45bc89df1f0c2e368dbadbc678bccde306 Mon Sep 17 00:00:00 2001
From: Lihao7788 <2470304407@qq.com>
Date: Sat, 8 Mar 2025 17:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=A0=E5=AE=9D=E9=89=B4=E5=AE=9A=EF=BC=8C?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=9C=BA=E6=99=AF=EF=BC=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9C=BA=E5=86=85=E5=AE=B9=E5=A1=AB=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Runtime/Scripts/HighlightTrigger.cs       |  3 +++
 Data/Xml/BaoShiZhuoMoJiaGong.xml              | 14 +++++-----
 Data/Xml/YuDiaoDeZhiZuo.xml                   | 24 ++++++++---------
 Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml       | 27 ++++++++++++++++---
 4 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs b/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs
index ae7d6125..dce06e25 100644
--- a/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs
+++ b/Assets/HighlightPlus/Runtime/Scripts/HighlightTrigger.cs
@@ -299,6 +299,7 @@ namespace HighlightPlus {
                     return;
                 }
                 Highlight(true);
+                hb.outline = 1;
             }
         }
 
@@ -307,6 +308,7 @@ namespace HighlightPlus {
             if (isActiveAndEnabled && triggerMode == TriggerMode.ColliderEventsOnlyOnThisObject) {
                 if (!CanInteract()) return;
                 Highlight(true);
+                hb.outline = 1;
             }
         }
 
@@ -316,6 +318,7 @@ namespace HighlightPlus {
             if (isActiveAndEnabled && triggerMode == TriggerMode.ColliderEventsOnlyOnThisObject) {
                 if (!CanInteract()) return;
                 Highlight(false);
+                hb.outline = 1;
             }
         }
 
diff --git a/Data/Xml/BaoShiZhuoMoJiaGong.xml b/Data/Xml/BaoShiZhuoMoJiaGong.xml
index 0849cbe0..fb6fcf48 100644
--- a/Data/Xml/BaoShiZhuoMoJiaGong.xml
+++ b/Data/Xml/BaoShiZhuoMoJiaGong.xml
@@ -37,7 +37,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/YouBiaoKaChi</Path>
     <Tip>数显游标卡尺</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/游卡标尺.png</Icon>
   </Device>
 
   <Device>
@@ -45,7 +45,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/JiHaoBi</Path>
     <Tip>记号笔</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/记号笔.png</Icon>
   </Device>
 
 
@@ -54,7 +54,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/SM_YanMoJi/ZhanGan</Path>
     <Tip>粘杆</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/粘竿.png</Icon>
   </Device>
 
   <Device>
@@ -62,7 +62,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/SM_YanMoJi/DingPingQi</Path>
     <Tip>顶平器</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/顶平器.png</Icon>
   </Device>
 
 
@@ -71,7 +71,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/BaJiaoShou</Path>
     <Tip>八角手</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/八角手.png</Icon>
   </Device>
 
   <Device>
@@ -79,7 +79,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/ZhiChi</Path>
     <Tip>直尺</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/直尺.png</Icon>
   </Device>
 
   <Device>
@@ -87,7 +87,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/BanShou</Path>
     <Tip>扳手</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/扳手.png</Icon>
   </Device>
 
 
diff --git a/Data/Xml/YuDiaoDeZhiZuo.xml b/Data/Xml/YuDiaoDeZhiZuo.xml
index 0d42838c..50e2444e 100644
--- a/Data/Xml/YuDiaoDeZhiZuo.xml
+++ b/Data/Xml/YuDiaoDeZhiZuo.xml
@@ -34,7 +34,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/JiHaoBi</Path>
     <Tip>记号笔</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/记号笔.png</Icon>
   </Device>
 
 
@@ -43,7 +43,7 @@
     <HighLight color="255,0,0,255"/>
     <Path>Main/ZhiChi</Path>
     <Tip>直尺</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/直尺.png</Icon>
   </Device>
 
   <Device>
@@ -51,42 +51,42 @@
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/ZuanKongTuoJu</Path>
     <Tip>钻孔砣具</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/钻孔坨具.png</Icon>
   </Device>
   <Device>
     <Name>修角砣具</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/XiuJiaoTuoJu</Path>
     <Tip>修角砣具</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/修角坨具.png</Icon>
   </Device>
   <Device>
     <Name>纹饰砣具</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/WenShiZhenTou</Path>
     <Tip>纹饰砣具</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/纹饰针头.png</Icon>
   </Device>
   <Device>
     <Name>平头砣具</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/PingTouTuoJu</Path>
     <Tip>平头砣具</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/平头坨具.png</Icon>
   </Device>
   <Device>
     <Name>布轮</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/BuLun</Path>
     <Tip>布轮</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/布轮.png</Icon>
   </Device>
   <Device>
     <Name>切割砣具</Name>
     <HighLight color="255,0,0,255"/>
     <Path>Env/SM_YuDiaoJi/QieGeTuoJu</Path>
     <Tip>切割砣具</Tip>
-    <Icon>工具/骨刀.png</Icon>
+    <Icon>工具/切割坨具.png</Icon>
   </Device>
 
 
@@ -106,6 +106,10 @@
         <Start>
           <Action type="Sequence">
 
+            <Action type="Move" value="FlyCamera" to="-0.075,1.75,-2.98" time="0"></Action>
+            <Action type="Rotate" value="FlyCamera" to="41.49,181.01,0" time="0"></Action>
+
+
             <Action type="TextTip" value="玉雕制作是一门融合了艺术创意与精湛技艺的传统工艺，有着悠久的历史和丰富的文化内涵。玉雕师根据玉石原料的形状、颜色、质地等特点进行设计创作，充分利用玉石的天然之美，将原料的瑕疵转化为作品的独特之处，使每一件玉雕作品都独一无二。本实验从画线-切割-粗雕-细雕-修整-抛光详细介绍玉雕制作过程。"  btns="确定"/>
             <Condition type="UIClick" value="UIRoot/PopUI/UITextTip/Mask/Content/BtnContent/确定"></Condition>
 
@@ -125,10 +129,6 @@
             <Action type="Hint" value="请选择合适的工具，在玉石原料上画出需要切割的圆环线" time="-1" icon="true" ></Action>
 
 
-            <Action type="Move" value="FlyCamera" to="-0.075,1.75,-2.98" time="0"></Action>
-            <Action type="Rotate" value="FlyCamera" to="41.49,181.01,0" time="0"></Action>
-
-
 
             <Action type="UITools" devices="记号笔,切割砣具,直尺,钻孔砣具,修角砣具,纹饰砣具,平头砣具,布轮" answers="记号笔"
                           setActive="true"
diff --git a/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml b/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml
index 9a51bb26..edf3ea66 100644
--- a/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml
+++ b/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml
@@ -20,7 +20,7 @@
           <Action type="UIBackPack" devices="偏光镜,棱镜式分光镜,光栅式分光镜"
               random="true"
               scrollSpeed="25"
-              position="right"></Action>
+              position="left"></Action>
           
           
         </Action>
@@ -29,12 +29,26 @@
 
     <State name="偏光镜">
       <Enter>
-      
 
-          
-         
+        <Action type="Sequence">
 
 
+          <Action type="Log" value="进入  偏光镜  状态"></Action>
+          <Action type="TextWindow" title="偏光镜" value="偏光镜是常规鉴定仪器中，往往是首先使用的仪器，因为它可以非常快速的确定宝石是否为均质体、非均质体，因此在宝石鉴定仪器中具有非常重要的地位。偏光镜的结构包括上下两个偏光片，光源、开关。下偏光片固定不动的，它的上面加装一个可以旋转的玻璃片，称为载物台。避免宝石与偏光片直接接触，影响仪器的使用寿命。"   position="right" scrollSpeed="25"/>
+          <Action type="Move" value="FlyCamera" to="0.0845993,1.371632,2.146553" time="0"></Action>
+          <Action type="Rotate" value="FlyCamera" to="21.66745,356.097,-5.741785E-08" time="0"></Action>
+
+          <Action type="StrEvent" name="HighLightTrigger" value="false"></Action>
+
+          <Action type="HighLightFlash" value="Env/ChangJing/SM_PianGuangJing" isHigh="true" color="200,50,50,255" time="0.25" count="-1"></Action>
+          <Action type="Delay" value="2"></Action>
+          <Action type="HighLightFlash" value="Env/ChangJing/SM_PianGuangJing" isHigh="false" color="255,0,0,255"></Action>
+
+          <Action type="StrEvent" name="HighLightTrigger" value="true"></Action>
+
+          <Action type="Log" value="进入  偏光镜1111  状态"></Action>
+        </Action>
+
       </Enter>
 <Exit>
   </Exit>
@@ -70,14 +84,19 @@
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/偏光镜"></Condition>
 
 
+
+
     </Transision>
     <Transision from="any" to="棱镜式分光镜">
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/棱镜式分光镜"></Condition>
+      <Action type="TextWindow" title="这里是标题" value="这里是文字描述"  audio="q001.mp3" btns="确定,取消"  position="left" scrollSpeed="25"/>
+
 
     </Transision>
     <Transision from="any" to="光栅式分光镜">
 
       <Condition type="UIClick" value="UIRoot/PopUI/UIBackPack/bg/Scroll/Viewport/Content/光栅式分光镜"></Condition>
+      <Action type="TextWindow" title="这里是标题" value="这里是文字描述"  audio="q001.mp3" btns="确定,取消"  position="left" scrollSpeed="25"/>
 
 
     </Transision>