From 808cfd917369f7769ca193d5a5f7081fdf26e661 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Mon, 30 Dec 2024 15:00:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=BB=E8=BE=91=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0reset=E5=BD=93=E5=89=8D=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/Controller/OperationController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/Scripts/Controller/OperationController.cs b/Assets/Scripts/Controller/OperationController.cs index dfad5464..07853dce 100644 --- a/Assets/Scripts/Controller/OperationController.cs +++ b/Assets/Scripts/Controller/OperationController.cs @@ -147,7 +147,7 @@ public class OperationController : MonoSingleton else if (this.index > targetIndex) { var seq = ActionKit.Sequence(); - for (int i = this.index; i > targetIndex; i--) + for (int i = this.index; i >= targetIndex; i--) { // ö ֱ IAction resetAction = ActionHelper.GetActionAndSub(steps[i].Reset); From 9c5b5c813a91aed681d3891eced6c69e9cfe9d63 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Mon, 30 Dec 2024 15:32:34 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Doc/Xml配置文档.xml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml index bd79d5cf..c2f8432c 100644 --- a/Doc/Xml配置文档.xml +++ b/Doc/Xml配置文档.xml @@ -21,13 +21,16 @@ - + + wrongEvent="" + rightScore="" + wrongScore="" + scoreStepName="手术准备器械选择"> From 60714bb1506d754da23df52c3fd39aea855e0b3f Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Mon, 30 Dec 2024 15:50:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/UI/UITools.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Assets/Scripts/UI/UITools.cs b/Assets/Scripts/UI/UITools.cs index ff0635ce..fe26cc69 100644 --- a/Assets/Scripts/UI/UITools.cs +++ b/Assets/Scripts/UI/UITools.cs @@ -44,6 +44,11 @@ namespace QFramework.Example foreach (var device in mData.devices) { var item = DeviceController.Instance.GetDevice(device); + if (item==null) + { + Debug.LogError(device + ":ûҵӦDevice"); + return; + } GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content); obj.name = item.Name; obj.transform.Find("Name").GetComponent().text = item.Name;