From fb2e719115a2eae46b206d3af9141747af299216 Mon Sep 17 00:00:00 2001
From: Lihao7788 <2470304407@qq.com>
Date: Tue, 8 Apr 2025 19:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Actions/LoadResAction.cs       |   3 ++
 Assets/Scripts/UI/UIDeviceTip.cs              |   1 +
 .../{工具/骨刀.png => gongju/gudao.png}       | Bin
 Data/DeviceIcons/{工具 => gongju}/咬骨钳.png  | Bin
 .../{工具 => gongju}/手术刀柄4号.png          | Bin
 .../{工具 => gongju}/手术刀片16号.png         | Bin
 Data/DeviceIcons/{工具 => gongju}/撬骨板.png  | Bin
 Data/DeviceIcons/{工具 => gongju}/铁锤.png    | Bin
 Data/Xml/02_SheYingQiCaiRenZhi.xml            |  50 +++++++++++-------
 9 files changed, 34 insertions(+), 20 deletions(-)
 rename Data/DeviceIcons/{工具/骨刀.png => gongju/gudao.png} (100%)
 rename Data/DeviceIcons/{工具 => gongju}/咬骨钳.png (100%)
 rename Data/DeviceIcons/{工具 => gongju}/手术刀柄4号.png (100%)
 rename Data/DeviceIcons/{工具 => gongju}/手术刀片16号.png (100%)
 rename Data/DeviceIcons/{工具 => gongju}/撬骨板.png (100%)
 rename Data/DeviceIcons/{工具 => gongju}/铁锤.png (100%)

diff --git a/Assets/Scripts/Actions/LoadResAction.cs b/Assets/Scripts/Actions/LoadResAction.cs
index a164d8c4..8f4553b1 100644
--- a/Assets/Scripts/Actions/LoadResAction.cs
+++ b/Assets/Scripts/Actions/LoadResAction.cs
@@ -55,7 +55,10 @@ namespace QFramework
                             if (string.IsNullOrEmpty(xmlStr) == false)
                             {
                                 // ����XML
+                         
                                 XDocument doc = XDocument.Parse(xmlStr);
+
+                                
                                 // ��ȡ��Ԫ��
                                 XElement moduleXml = doc.Root;
                                 if (string.IsNullOrEmpty(index))
diff --git a/Assets/Scripts/UI/UIDeviceTip.cs b/Assets/Scripts/UI/UIDeviceTip.cs
index 34c7c7b0..dd982b6c 100644
--- a/Assets/Scripts/UI/UIDeviceTip.cs
+++ b/Assets/Scripts/UI/UIDeviceTip.cs
@@ -45,6 +45,7 @@ namespace QFramework.Example
 
         protected override void OnShow()
         {
+        
             Active(true);
         }
 
diff --git a/Data/DeviceIcons/工具/骨刀.png b/Data/DeviceIcons/gongju/gudao.png
similarity index 100%
rename from Data/DeviceIcons/工具/骨刀.png
rename to Data/DeviceIcons/gongju/gudao.png
diff --git a/Data/DeviceIcons/工具/咬骨钳.png b/Data/DeviceIcons/gongju/咬骨钳.png
similarity index 100%
rename from Data/DeviceIcons/工具/咬骨钳.png
rename to Data/DeviceIcons/gongju/咬骨钳.png
diff --git a/Data/DeviceIcons/工具/手术刀柄4号.png b/Data/DeviceIcons/gongju/手术刀柄4号.png
similarity index 100%
rename from Data/DeviceIcons/工具/手术刀柄4号.png
rename to Data/DeviceIcons/gongju/手术刀柄4号.png
diff --git a/Data/DeviceIcons/工具/手术刀片16号.png b/Data/DeviceIcons/gongju/手术刀片16号.png
similarity index 100%
rename from Data/DeviceIcons/工具/手术刀片16号.png
rename to Data/DeviceIcons/gongju/手术刀片16号.png
diff --git a/Data/DeviceIcons/工具/撬骨板.png b/Data/DeviceIcons/gongju/撬骨板.png
similarity index 100%
rename from Data/DeviceIcons/工具/撬骨板.png
rename to Data/DeviceIcons/gongju/撬骨板.png
diff --git a/Data/DeviceIcons/工具/铁锤.png b/Data/DeviceIcons/gongju/铁锤.png
similarity index 100%
rename from Data/DeviceIcons/工具/铁锤.png
rename to Data/DeviceIcons/gongju/铁锤.png
diff --git a/Data/Xml/02_SheYingQiCaiRenZhi.xml b/Data/Xml/02_SheYingQiCaiRenZhi.xml
index 00b66233..c4b85956 100644
--- a/Data/Xml/02_SheYingQiCaiRenZhi.xml
+++ b/Data/Xml/02_SheYingQiCaiRenZhi.xml
@@ -163,8 +163,36 @@
   </Descript>
 
 
-
-
+  <Device>
+    <Name>三脚架</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_Sanjiaojia</Path>
+    <Icon>gongju/gudao.png</Icon>
+  </Device>
+  <Device>
+    <Name>单反</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_danfan</Path>
+    <Icon>gongju/gudao.png</Icon>
+  </Device>
+  <Device>
+    <Name>摄影机</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_Shexiangji</Path>
+    <Icon>gongju/gudao.png</Icon>
+  </Device>
+  <Device>
+    <Name>绿幕</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_lvmu</Path>
+    <Icon>gongju/gudao.png</Icon>
+  </Device>
+  <Device>
+    <Name>补光灯</Name>
+    <HighLight color="255,0,0,255"/>
+    <Path>Main/SM_buguangdeng</Path>
+    <Icon>gongju/gudao.png</Icon>
+  </Device>
   <Device>
     <Name>单反-电源开关</Name>
     <HighLight color="255,0,0,255"/>
@@ -220,12 +248,6 @@
     <Tip>取景器：拍摄（记录/待机）和播放过程中，摄像机的状态和设置会叠加到取景器中显示的图像上。</Tip>
   </Device>
 
-  <!--<Device>
-    <Name>摄像机-记录指示灯</Name>
-    <HighLight color="255,0,0,255"/>
-    <Path>Main/SM_danfan/SM_kuaimen</Path>
-    <Tip>记录指示灯：当记录存储卡或电池上的剩余容量太低时闪烁。</Tip>
-  </Device>-->
   
   
   <Device>
@@ -242,19 +264,7 @@
   </Device>
 
 
-  <!--<Device>
-    <Name>摄像机-焦距调整旋钮</Name>
-    <HighLight color="255,0,0,255"/>
-    <Path>Main/SM_danfan/SM_kuaimen</Path>
-    <Tip>焦距调整旋钮：通常位于摄像机镜头的外部，通过旋转焦距调整旋钮，可以改变镜头的焦距长度。</Tip>
-  </Device>
   
-  <Device>
-    <Name>摄像机-调焦旋钮</Name>
-    <HighLight color="255,0,0,255"/>
-    <Path>Main/SM_danfan/SM_kuaimen</Path>
-    <Tip>调焦旋钮：通过旋转调焦旋钮，可以改变摄像机镜头的焦距，使拍摄的主体在画面中清晰成像。用户可以直接用手旋转调焦旋钮，根据自己的视觉判断和拍摄需求来精确调整焦距。</Tip>
-  </Device>-->
 
 
   <Score>