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 @@ - - + + 三脚架 + + Main/SM_Sanjiaojia + gongju/gudao.png + + + å•å + + Main/SM_danfan + gongju/gudao.png + + + 摄影机 + + Main/SM_Shexiangji + gongju/gudao.png + + + 绿幕 + + Main/SM_lvmu + gongju/gudao.png + + + è¡¥å…‰ç¯ + + Main/SM_buguangdeng + gongju/gudao.png + å•å-电æºå¼€å…³ @@ -220,12 +248,6 @@ å–æ™¯å™¨ï¼šæ‹æ‘„(记录/å¾…æœºï¼‰å’Œæ’­æ”¾è¿‡ç¨‹ä¸­ï¼Œæ‘„åƒæœºçš„状æ€å’Œè®¾ç½®ä¼šå åŠ åˆ°å–æ™¯å™¨ä¸­æ˜¾ç¤ºçš„图åƒä¸Šã€‚ - @@ -242,19 +264,7 @@ -