人生啊人生 2 hete
szülő
commit
9a12092b76

+ 10 - 20
src/components/ThreeWorldEventQingXiCheAndQv/event/store/QingXiCheAndQvProcessEventStore.js

@@ -19,8 +19,7 @@ export const QingXiCheAndQvProcessEventStore = defineStore('QingXiCheAndQvProces
             {
                 "note" : "点击下一步开始仿真实验",
                 "name" : "仿真模拟",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
 
             {
@@ -40,8 +39,7 @@ export const QingXiCheAndQvProcessEventStore = defineStore('QingXiCheAndQvProces
             {
                 "note" : "行至车辆区域",
                 "name" : "行至车辆区域",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
 
             // 因为需求,该流程放到这里
@@ -643,8 +641,7 @@ export const QingXiCheAndQvProcessEventStore = defineStore('QingXiCheAndQvProces
             {
                 "note" : "已完成所有任务",
                 "name" : "equipmentRepositioningWork",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
 
 
@@ -652,44 +649,37 @@ export const QingXiCheAndQvProcessEventStore = defineStore('QingXiCheAndQvProces
             {
                 "note" : "将阀门关闭停止水流",
                 "name" : "数字修复虚拟仿真-将阀门关闭停止水流",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
             {
                 "note" : "将橡胶垫片放置到正确的位置",
                 "name" : "数字修复虚拟仿真-将橡胶垫片放置到正确的位置",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
             {
                 "note" : "将抱箍放置到正确的位置",
                 "name" : "数字修复虚拟仿真-将抱箍放置到正确的位置",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
             {
                 "note" : "将插销安装到正确的位置",
                 "name" : "数字修复虚拟仿真-将插销安装到正确的位置",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
             {
                 "note" : "将螺丝安装到正确的位置",
                 "name" : "数字修复虚拟仿真-将螺丝安装到正确的位置",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
             {
                 "note" : "用扳手将螺丝旋紧螺丝",
                 "name" : "数字修复虚拟仿真-用扳手将螺丝旋紧螺丝",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
             {
                 "note" : "已完成所有任务",
                 "name" : "数字修复虚拟仿真-已完成所有任务",
-                "correctAnswerMesh" : {
-                },
+                "correctAnswerMesh" : null,
             },
             
         ],

+ 15 - 0
src/components/ThreeWorldEventQingXiCheAndQv/js/QingXiCheAndQvThreeWorldEvent.js

@@ -233,6 +233,21 @@ export class QingXiCheAndQvThreeWorldEvent {
         var objIframe = this.objIframe;
         var BABYLON = this.BABYLON;
         
+        // 优先判断当前流程,是否需要进行物体点击判断逻辑的触发
+        let listIndex = QingXiCheAndQvCarEventClick.find().QingXiCheAndQvProcessEventStore.obj.listIndex;
+        let list = QingXiCheAndQvCarEventClick.find().QingXiCheAndQvProcessEventStore.obj.list;
+        if (list[listIndex] == null || list[listIndex] == undefined) {
+            return false;
+        }
+
+        // 得到当前流程的配置
+        let obj = list[listIndex];
+        // console.log("experimentMeshBool 得到当前的流程", obj);
+
+        if (typeof obj.correctAnswerMesh != 'object' || obj.correctAnswerMesh == {}) {
+            return false;
+        }
+        
         // console.log("experimentMeshBool =====>", pickResult, QingXiCheAndQvCarEventClick.find().QingXiCheAndQvProcessEventStore);
         var objMesh = pickResult.pickedMesh;