11 changed files with 47 additions and 74 deletions
--- a/Assets/Art/UIPrefab/UITipWindow.prefab
+++ b/Assets/Art/UIPrefab/UITipWindow.prefab
@ -652,8 +652,8 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Padding:
-    m_Left: 20
-    m_Right: 20
+    m_Left: 0
+    m_Right: 0
    m_Top: 20
    m_Bottom: 0
  m_ChildAlignment: 1
--- a/Assets/Scenes/Scene.unity
+++ b/Assets/Scenes/Scene.unity
@ -5596,7 +5596,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 919132149155446097, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3}
      propertyPath: m_IsActive
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1006628450200583063, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
--- a/Assets/Scripts/Controller/ScoreController.cs
+++ b/Assets/Scripts/Controller/ScoreController.cs
@ -83,10 +83,6 @@ public class ScoreController : MonoSingleton<ScoreController>
                scoreDict[key].value = 0;
            }
        }
-        else
-        {
-            Debug.LogError("没有找到 评分点：" + key);
-        }
    }


--- a/Assets/Scripts/TimeScaleController.cs
+++ b/Assets/Scripts/TimeScaleController.cs
@ -39,12 +39,12 @@ public class TimeScaleController : MonoBehaviour
        }
        if (Input.GetKey(KeyCode.LeftControl) || Input.GetKey(KeyCode.RightControl))
        {
-            if (Input.GetKeyDown(KeyCode.C))
+            if (Input.GetKeyDown(KeyCode.Q))
            {
                string str = string.Empty;
                str = $"{gameObject.transform.position}|{gameObject.transform.eulerAngles}";
 #if UNITY_WEBGL
-                Debug.Log("Ctrl + Q 被按下！"+str);
+                Debug.Log("Ctrl + Q 被按下！");
                CopyToClipboard(str);
 #elif UNITY_STANDALONE_WIN && !UNITY_EDITOR
                // Ê¾ÀýÊý¾Ý
@ -53,14 +53,18 @@ public class TimeScaleController : MonoBehaviour
 #endif
            }
 #if UNITY_STANDALONE_WIN &&!UNITY_EDITOR
-            if (Input.GetKeyDown(KeyCode.V))
+            if (Input.GetKeyDown(KeyCode.E))
            {
                string tmp = GUIUtility.systemCopyBuffer;
-                Debug.Log("当前剪贴板：" + tmp);
+                Debug.LogError("当前剪贴板：" + tmp);
                tmp = tmp.Replace("(", "");
+                Debug.LogError(tmp);
                tmp = tmp.Replace(")", "");
+                Debug.LogError(tmp);
                var datas = tmp.Split('|');

+                Debug.LogError(datas[0]);
+                Debug.LogError(datas[1]);
                gameObject.transform.position = Utility.GetVector3FromStrArray(datas[0]);
                gameObject.transform.eulerAngles = Utility.GetVector3FromStrArray(datas[1]);
            }
--- a/Assets/Scripts/Tools/AsposeHelper.cs
+++ b/Assets/Scripts/Tools/AsposeHelper.cs
@ -5,14 +5,14 @@ using System.IO;
 using UnityEngine;
 using System.Windows.Forms;
 using Newtonsoft.Json.Linq;
-using System;

 public class AsposeHelper : MonoBehaviour
 {


-    public static void Writer(string json, Action<DialogResult> callback = null)
+    public static void Writer(string json)
    {
+        Debug.LogError(File.Exists(Global.reportDemoPath));
        // 加载Word文档
        Document doc = new Document(Global.reportDemoPath);

@ -25,23 +25,21 @@ public class AsposeHelper : MonoBehaviour
            doc.Range.Replace($"{{{key}}}", $"{value}", new FindReplaceOptions());
        }
        // 替换文本
-        SaveWithDialog(doc, callback);
+        SaveWithDialog(doc);
        //Debug.Log("文档处理完成，新文档已保存到: " + outputFilePath);



    }

-    private static void SaveWithDialog(Document doc, Action<DialogResult> callback)
+    private static void SaveWithDialog(Document doc)
    {
        SaveFileDialog dialog = new SaveFileDialog();
        dialog.Filter = "Word文档|*.docx";
-        var result = dialog.ShowDialog();
-        if (result == DialogResult.OK)
+        if (dialog.ShowDialog() == DialogResult.OK)
        {
            doc.Save(dialog.FileName);
        }
-        callback?.Invoke(result);
    }
 }

--- a/Assets/Scripts/UI/UICameraSwitch.cs
+++ b/Assets/Scripts/UI/UICameraSwitch.cs
@ -21,7 +21,6 @@ namespace QFramework.Example
    }
    public partial class UICameraSwitch : UIPanel
    {
-        bool firstFreeMove = true;
        protected override void OnInit(IUIData uiData = null)
        {
            TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
@ -115,14 +114,6 @@ namespace QFramework.Example
                {
                    Near.isOn = false;
                    Far.isOn = false;
-                    if (firstFreeMove)
-                    {
-                        UITipWindowData data = new UITipWindowData();
-                        data.txt = "已切换至自由移动视角，点右下角按钮可回到预制视角。";
-                        data.btns.Add(new UITipWindowData.ItemData() { txt = "确定" });
-                        UIKit.OpenPanelAsync<UITipWindow>(canvasLevel: UILevel.PopUI, uiData: data).ToAction().StartGlobal();
-                        firstFreeMove = false;
-                    }
                }
            }

--- a/Assets/Scripts/UI/UIInstruction.cs
+++ b/Assets/Scripts/UI/UIInstruction.cs
@ -13,7 +13,6 @@ namespace QFramework.Example
    public partial class UIInstruction : UIPanel
    {
        bool isNo = false;
-        bool isOperation = false;
        protected override void OnInit(IUIData uiData = null)
        {
            TypeEventSystem.Global.Register<OnModuleQuit>((arg) => Hide()).UnRegisterWhenGameObjectDestroyed(gameObject);
@ -47,17 +46,8 @@ namespace QFramework.Example
            });
            ConfirmBtn.onClick.AddListener(() =>
            {
-                if (isOperation == false)
-                {
-                    Operation.isOn = true;
-                    isOperation = true;
-                }
-                else
-                {
-                    Hide();
-                    isNo = NoToggle.isOn;
-
-                }
+                Hide();
+                isNo = NoToggle.isOn;
            });


@ -92,7 +82,6 @@ namespace QFramework.Example
        protected override void OnHide()
        {
            mData = null;
-            StringEventSystem.Global.Send(this.GetType().Name + "Hide");
        }

        protected override void OnClose()
--- a/Assets/Scripts/UI/UIScore.cs
+++ b/Assets/Scripts/UI/UIScore.cs
@ -36,12 +36,7 @@ namespace QFramework.Example
                });
                loader.LoadAsync();
 #elif UNITY_STANDALONE_WIN
-                DownLoad.interactable = false;
-                AsposeHelper.Writer(GetScoreDataJson(), result =>
-                {
-                    Debug.LogError("111");
-                    DownLoad.interactable = true;
-                });
+                AsposeHelper.Writer(GetScoreDataJson());
 #endif


--- a/Assets/Scripts/UI/UITools.cs
+++ b/Assets/Scripts/UI/UITools.cs
@ -42,7 +42,6 @@ namespace QFramework.Example

        protected override void OnOpen(IUIData uiData = null)
        {
-            mData = uiData as UIToolsData ?? new UIToolsData();
            TypeEventSystem.Global.Register<StepStatusOnChange>(OnStepChanged).UnRegisterWhenDisabled(gameObject);
            if (mData.totalScore > 0)
            {
--- a/Assets/Scripts/Xml/XmlParser.cs
+++ b/Assets/Scripts/Xml/XmlParser.cs
@ -265,7 +265,7 @@ namespace XMLTool
                // 解析模块名称
                module.type = moduleElement.Element("Type")?.Value;
                module.ModuleName = moduleElement.Element("Name")?.Value;
-                module.Descript = moduleElement.Element("Descript")?.Value.Trim();
+                module.Descript = moduleElement.Element("Descript")?.Value;
                module.Scene = moduleElement.Element("Scene")?.Value;

                // 解析设备
--- a/Data/Xml/Pig5.xml
+++ b/Data/Xml/Pig5.xml
@ -13,11 +13,8 @@
          <Action type="UIShow" value="UIOperationList"></Action>
          <Action type="NextOperation"></Action>
          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4 (1)"  isShow="false" ></Action>
-          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian1" isShow="false" isDevice="false"></Action>
-          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian2" isShow="false" isDevice="false"></Action>
-          <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan" isShow="false" isDevice="false"></Action>
-          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoZhu" isShow="false" isDevice="false"></Action>
-          
+          <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4 (1)"  isShow="false" ></Action>
+
        </Action>
      </Enter>
    </State>
@ -75,6 +72,15 @@


  <Device>
+    <Name>剪牙钳</Name>
+    <HighLight color="255,255,255"/>
+    <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_JianYaQian</Path>
+    <Tip>剪牙钳</Tip>
+    <Icon>工具/剪牙钳.png</Icon>
+  </Device>
+  <Device>
+
+
    <Name>医用酒精</Name>
    <HighLight color="255,255,255"/>
    <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_YiYongJiuJing</Path>
@ -151,12 +157,6 @@
    <Icon>工具/碘酊.png</Icon>
  </Device>

-  <Device>
-    <Name>量杯</Name>
-    <HighLight color="255,255,255"/>
-    <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_LiangBei</Path>
-    <Tip>量杯</Tip>
-  </Device>


  <Device>
@ -169,6 +169,12 @@



+  <Device>
+    <Name>量杯</Name>
+    <HighLight color="255,255,255"/>
+    <Path>ExamPrefab/Teach_ToolsChose/SM_gongju/SM_LiangBei</Path>
+    <Tip>量杯</Tip>
+  </Device>



@ -460,12 +466,7 @@
            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/juese" isShow="false"></Action>
            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoZhu" isShow="false"></Action>

-
-            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian1" isShow="false" isDevice="false"></Action>
-            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an3_4/SM_XiaoTuiChe/SM_XiaoWuJian/SM_JianYaQian2" isShow="false" isDevice="false"></Action>
-            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_XiaoWuJian/SM_ShouShuTuoPan" isShow="false" isDevice="false"></Action>
-          
-
+            
            <Action type="Show" value="ExamPrefab/Teach_ToolsChose/SM_gongju/SM_ShouNaDai" isShow="true"></Action>
            
            <!--点击下一步，进行-->
@ -484,14 +485,14 @@
          </Action>
        </Start>

-        <Finished>
+        <!--<Finished>
          <Action type="Sequence">
            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/juese" isShow="true"></Action>
            <Action type="Show" value="ExamPrefab/Teach_ModelChose/SM_zhu_an5_6/SM_XiaoZhu" isShow="true"></Action>
            <Action type="StrEvent" name="HighLightTrigger" value="true"></Action>

          </Action>
-        </Finished>
+        </Finished>-->
        
      </Step>

@ -499,17 +500,17 @@


      <Step name="人员准备">
-        <Reset>
+        <!--<Reset>
          <Action type="Sequence">



-            <!--<Action type="Parallel">
+            <Action type="Parallel">
              <Action type="Rotate" value="FlyCamera" to="17.27, 183.30, 0.00" time="0"></Action>

              <Action type="Move" value="FlyCamera" to="3.97, 3.37, -24.80" time="0"></Action>

-            </Action>-->
+            </Action>



@ -519,12 +520,12 @@



-            <!--初始化人员准备
-            人物身上衣服隐藏-->
+            --><!--初始化人员准备--><!--
+            --><!--人物身上衣服隐藏--><!--
            <Action type="Show" value="ExamPrefab/huanzhuang/ChuanDai/ChuanDai_GongZuoFu" isShow="false"></Action>
            <Action type="Show" value="ExamPrefab/huanzhuang/ChuanDai/ChuanDai_KouZhao" isShow="false"></Action>
            <Action type="Show" value="ExamPrefab/huanzhuang/ChuanDai/ChuanDai_MaoZi" isShow="false"></Action>
-            <!--物品显示-->
+            --><!--物品显示--><!--
            <Action type="Show" value="ExamPrefab/huanzhuang/WuPin/GongZuoFu" isShow="true"></Action>
            <Action type="Show" value="ExamPrefab/huanzhuang/WuPin/MaoZi" isShow="true"></Action>
            <Action type="Show" value="ExamPrefab/huanzhuang/WuPin/KouZhao" isShow="true"></Action>
@ -538,7 +539,7 @@


          </Action>
-        </Reset>
+        </Reset>-->

        <Start>
          <Action type="Sequence">