JiNan/VirtualFramework
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into LouDi_Pig

Browse Source
This commit is contained in:
李浩 2024-12-30 16:13:37 +08:00
commit 20b7ad7b08
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/Controller/OperationController.cs
View File

@ -147,7 +147,7 @@ public class OperationController : MonoSingleton<OperationController>
else if (this.index > targetIndex) else if (this.index > targetIndex)
{ {
var seq = ActionKit.Sequence(); 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); IAction resetAction = ActionHelper.GetActionAndSub(steps[i].Reset);

5
Assets/Scripts/UI/UITools.cs
View File

@ -44,6 +44,11 @@ namespace QFramework.Example
foreach (var device in mData.devices) foreach (var device in mData.devices)
{ {
var item = DeviceController.Instance.GetDevice(device); var item = DeviceController.Instance.GetDevice(device);
if (item==null)
{
Debug.LogError(device + ":没有找到对应的Device配置");
return;
}
GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content); GameObject obj = GameObject.Instantiate(ItemPrefab.gameObject, Content);
Debug.Log(item.Name + "????"); Debug.Log(item.Name + "????");
obj.name = item.Name; obj.name = item.Name;

7
Doc/Xml配置文档.xml
View File

@ -21,13 +21,16 @@
<Action type="Anim" value="物体路径" animName="动画名字" frame="-1" speed="1"></Action> <Action type="Anim" value="物体路径" animName="动画名字" frame="-1" speed="1"></Action>
<!--右下角生成按钮 可生成多个 用逗号分开--> <!--右下角生成按钮 可生成多个 用逗号分开-->
<Action type="Btns" value="按钮1,按钮2,按钮3"></Action> <Action type="Btns" value="按钮1,按钮2,按钮3"></Action>
<!--用于右侧道具栏选择正确的道具 event用于配合StrEventCondition 做检测 --> <!--用于右侧道具栏选择正确的道具 event用于配合StrEventCondition 做检测 rightScore 正确选择一个 得分 wrongScore 错误一个 得分 scoreStepName是评分的key -->
<Action type="UITools" devices="道具名字1" answers="正确道具" <Action type="UITools" devices="道具名字1" answers="正确道具"
setActive="true" setActive="true"
rightLabel="提示：器械选择正确。" rightLabel="提示：器械选择正确。"
wrongLabel="提示：器械选择错误，\r\n当前模块中，不需要该物品。" wrongLabel="提示：器械选择错误，\r\n当前模块中，不需要该物品。"
rightEvent="" rightEvent=""
wrongEvent=""></Action> wrongEvent=""
rightScore=""
wrongScore=""
scoreStepName="手术准备器械选择"></Action>
<!--物体点位选择 物体的中心点--> <!--物体点位选择 物体的中心点-->
<Action type="PointQuestion" value="路径1,路径2"></Action> <Action type="PointQuestion" value="路径1,路径2"></Action>