人生啊人生 3 weeks ago
parent
commit
d7c2ee2ad7

+ 1 - 1
user_web/src/components/CarSimulation/CarThreeWorldEvent/CarThreeWorldEventMain.vue

@@ -1279,7 +1279,7 @@ const moveUpdateMouseStyle = () => {
                 "exhibition_html_1710385814466_相机_primitive2",
                 "exhibition_html_1710385814466_相机_primitive3",
 
-                "exhibition_html_1710385814466_绕线车-电源线",
+                "exhibition_html_1757573408562_绕线车-电源线",
 
                 "exhibition_html_1710385814466_绕线车-纠偏轮_primitive0",
                 "exhibition_html_1710385814466_绕线车-纠偏轮_primitive1",

+ 6 - 6
user_web/src/components/CarSimulation/CarThreeWorldEvent/event/CarDragAndDropEvent.js

@@ -320,7 +320,7 @@ export class CarDragAndDropEvent {
             ) ||  (
                 statue == "将绕线车的电源线安装到正确的位置"
                 && (
-                    objMesh.id == "exhibition_html_1710385814466_绕线车-电源线"
+                    objMesh.id == "exhibition_html_1757573408562_绕线车-电源线"
                 )
             ) ||  (
                 statue == "将绕线车的纠偏轮安装到正确的位置"
@@ -920,9 +920,9 @@ export class CarDragAndDropEvent {
                                     new this.BABYLON.Vector3(parseFloat(thisPositionList.x), parseFloat(thisPositionList.y), parseFloat(thisPositionList.z))
                                 );
 
-                                // console.log(
-                                //     "thisVector3distanceTo", thisVector3distanceTo
-                                // );
+                                console.log(
+                                    "thisVector3distanceTo 拖拽距离 ---", thisVector3distanceTo, distance
+                                );
 
                                 if (thisVector3distanceTo <= distance) {
 
@@ -1186,7 +1186,7 @@ export class CarDragAndDropEvent {
             case '将绕线车的电源线安装到正确的位置':
 
                 list = [
-                    "exhibition_html_1710385814466_绕线车-电源线",
+                    "exhibition_html_1757573408562_绕线车-电源线",
                 ];
 
                 this.dragAndDropPointerupAnimationEvent(statue, list, 'mesh');
@@ -1666,7 +1666,7 @@ export class CarDragAndDropEvent {
             addPosition2 = { "x" : 0, "y" : 0.25, "z" : 0 };
         }
 
-        else if (this.objClickMesh.id == "exhibition_html_1710385814466_绕线车-电源线") {
+        else if (this.objClickMesh.id == "exhibition_html_1757573408562_绕线车-电源线") {
             addPosition2 = { "x" : 0, "y" : 0.2, "z" : 0 };
         }
 

+ 24 - 14
user_web/src/components/ChengGuangYuanJing/store/CommonValStore.js

@@ -100,7 +100,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
 
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__10”后轮右" : {
@@ -118,7 +119,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__10”前轮左" : {
@@ -136,7 +138,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__10”后轮左" : {
@@ -153,7 +156,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__6”前轮右" : {
@@ -164,7 +168,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__6”中轮右" : {
@@ -175,7 +180,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__6”后轮右" : {
@@ -186,7 +192,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__6”前轮左" : {
@@ -197,7 +204,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__6”中轮左" : {
@@ -208,7 +216,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__6”后轮左" : {
@@ -219,7 +228,8 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                     { "x": -35.940913163484765, "y": 0.2611965530740943, "z": 1.4418194596657141 },
                     { "x": -35.98077442553885, "y": 0.28303039587231626, "z": 1.671832325448381 }
                 ],
-                "distance" : 0.8,
+                // "distance" : 0.8,
+                "distance" : 1.3,
             },
 
             "exhibition_html_1710385814466__防撞杆" : {
@@ -284,7 +294,7 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                 "distance" : 0.9,
             },
 
-            "exhibition_html_1710385814466_绕线车-电源线" : {
+            "exhibition_html_1757573408562_绕线车-电源线" : {
                 "animationInstall" : { "name" : "绕线车-电源线", "speed" : 1, "from" : 0, "to" : 0 },
                 "animationEnd" : { "name" : "绕线车-电源线", "speed" : 1, "from" : 32, "to" : 32 },
                 // 可在范围坐标
@@ -845,7 +855,7 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                 ],
                 "heighLight" : [
 
-                    "exhibition_html_1710385814466_绕线车-电源线",
+                    "exhibition_html_1757573408562_绕线车-电源线",
                     
                 ],
 
@@ -1191,7 +1201,7 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                 "txt" : "相机",
             },
 
-            "exhibition_html_1710385814466_绕线车-电源线" : {
+            "exhibition_html_1757573408562_绕线车-电源线" : {
                 "txt" : "电源线",
             },
             "exhibition_html_1710385814466_绕线车-纠偏轮_primitive0" : {
@@ -1533,7 +1543,7 @@ export const CommonValStore = defineStore('CommonValStore', () => {
                 "heighLight" : [
 
                     "exhibition_html_1710385814466_绕线车文字02",
-                    "exhibition_html_1710385814466_绕线车-电源线",
+                    "exhibition_html_1757573408562_绕线车-电源线",
                     
                 ],
                 // 被透明的物体,以及显示线框的物体

+ 1 - 1
user_web/src/components/student/CourseChapter3d.vue

@@ -1099,7 +1099,7 @@ const moveUpdateMouseStyle = () => {
                 "exhibition_html_1710385814466_相机_primitive2",
                 "exhibition_html_1710385814466_相机_primitive3",
 
-                "exhibition_html_1710385814466_绕线车-电源线",
+                "exhibition_html_1757573408562_绕线车-电源线",
 
                 "exhibition_html_1710385814466_绕线车-纠偏轮_primitive0",
                 "exhibition_html_1710385814466_绕线车-纠偏轮_primitive1",

+ 3 - 3
user_web/src/components/student/event/DragAndDropEvent.ts

@@ -291,7 +291,7 @@ export class DragAndDropEvent {
             ) ||  (
                 statue == "将绕线车的电源线安装到正确的位置"
                 && (
-                    objMesh.id == "exhibition_html_1710385814466_绕线车-电源线"
+                    objMesh.id == "exhibition_html_1757573408562_绕线车-电源线"
                 )
             ) ||  (
                 statue == "将绕线车的纠偏轮安装到正确的位置"
@@ -1137,7 +1137,7 @@ export class DragAndDropEvent {
             case '将绕线车的电源线安装到正确的位置':
 
                 list = [
-                    "exhibition_html_1710385814466_绕线车-电源线",
+                    "exhibition_html_1757573408562_绕线车-电源线",
                 ];
 
                 this.dragAndDropPointerupAnimationEvent(statue, list, 'mesh');
@@ -1603,7 +1603,7 @@ export class DragAndDropEvent {
             addPosition2 = { "x" : 0, "y" : 0.25, "z" : 0 };
         }
 
-        else if (this.objClickMesh.id == "exhibition_html_1710385814466_绕线车-电源线") {
+        else if (this.objClickMesh.id == "exhibition_html_1757573408562_绕线车-电源线") {
             addPosition2 = { "x" : 0, "y" : 0.2, "z" : 0 };
         }
 

+ 4 - 4
user_web/src/stores/threeWorld.ts

@@ -275,7 +275,7 @@ export const threeWorld = defineStore('threeWorld', () => {
                 "distance" : 0.9,
             },
 
-            "exhibition_html_1710385814466_绕线车-电源线" : {
+            "exhibition_html_1757573408562_绕线车-电源线" : {
                 "animationInstall" : { "name" : "绕线车-电源线", "speed" : 1, "from" : 0, "to" : 0 },
                 "animationEnd" : { "name" : "绕线车-电源线", "speed" : 1, "from" : 32, "to" : 32 },
                 // 可在范围坐标
@@ -846,7 +846,7 @@ export const threeWorld = defineStore('threeWorld', () => {
                 ],
                 "heighLight" : [
 
-                    "exhibition_html_1710385814466_绕线车-电源线",
+                    "exhibition_html_1757573408562_绕线车-电源线",
                     
                 ],
 
@@ -1192,7 +1192,7 @@ export const threeWorld = defineStore('threeWorld', () => {
                 "txt" : "相机",
             },
 
-            // "exhibition_html_1710385814466_绕线车-电源线" : {
+            // "exhibition_html_1757573408562_绕线车-电源线" : {
             //     "txt" : "电源线",
             // },
             "exhibition_html_1757573408562_绕线车-电源线" : {
@@ -1537,7 +1537,7 @@ export const threeWorld = defineStore('threeWorld', () => {
                 "heighLight" : [
 
                     "exhibition_html_1710385814466_绕线车文字02",
-                    "exhibition_html_1710385814466_绕线车-电源线",
+                    "exhibition_html_1757573408562_绕线车-电源线",
                     
                 ],
                 // 被透明的物体,以及显示线框的物体