diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js index d3c4bc99b..c35163642 100644 --- a/src/jlmap3d/lesson3d/lesson3dplayer.js +++ b/src/jlmap3d/lesson3d/lesson3dplayer.js @@ -64,9 +64,8 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { accidentManager.loadAccidentList(lessonData.accidentList) } let loadingInstance = Loading.service({ fullscreen: true }); - let assetModelManager = new AssetModelManager(scope,scene,controlManager); + let assetModelManager = new AssetModelManager(scope,scene); - console.log(lessonData); assetModelManager.lessonAssetsLoader(lessonData).then((result) => { scope.nowSceneType = lessonData.lessonProgress[0].progressScene; animateManager.initAnimation(assetModelManager); diff --git a/src/jlmap3d/lesson3d/manager/animatemanager.js b/src/jlmap3d/lesson3d/manager/animatemanager.js index 28803d4e3..f5f25c5b7 100644 --- a/src/jlmap3d/lesson3d/manager/animatemanager.js +++ b/src/jlmap3d/lesson3d/manager/animatemanager.js @@ -8,9 +8,12 @@ export function AnimateManager() { let mixers = []; this.actions = []; + + let clock = new THREE.Clock(); + let mixerUpdateDelta; + + this.initAnimation = function(assetModelManager){ - - for(let k in assetModelManager.staticAsset){ if(assetModelManager.staticAsset[k].mesh.animations.length > 0){ // console.log(assetModelManager.staticAsset[k]); @@ -57,10 +60,28 @@ export function AnimateManager() { } } + + for(let j in assetModelManager.lessonTriggerList){ + for(let i =0;i=0;i--){ diff --git a/src/jlmap3d/lesson3d/manager/assetmodelmanager.js b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js index abcfccfa5..9ddd677ca 100644 --- a/src/jlmap3d/lesson3d/manager/assetmodelmanager.js +++ b/src/jlmap3d/lesson3d/manager/assetmodelmanager.js @@ -112,9 +112,7 @@ export function AssetModelManager(editor,scene) { scope.lessonTriggerList["dc"] = []; this.changeSceneGroup = function(groupType){ - // console.log(groupType); - // console.log(editor.nowSceneType); - // console.log(scope.lessonTriggerList[editor.nowSceneType]); + editor.nowSceneType = groupType; scene.remove(this.otherModel); this.otherModel = groupList[groupType]; @@ -153,10 +151,14 @@ export function AssetModelManager(editor,scene) { initTriggerList(); let modelList = lessonData.modelList; for(let i=0;i0){ + newModelTrigger.animations = scope.loadAsset[modelList[i].modelId].mesh.animations; + newModelTrigger.cloneanimations = true; + } newModelTrigger.showType = "loadModel"; newModelTrigger.label = modelList[i].label; + newModelTrigger.name = modelList[i].label; newModelTrigger.modelId = modelList[i].modelId; newModelTrigger.visible = modelList[i].visible; newModelTrigger.position.x = modelList[i].pos.x; diff --git a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue index 2a3a79e42..331fe4156 100644 --- a/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue +++ b/src/views/jlmap3d/lesson3dplayer/lesson3dplayer.vue @@ -318,7 +318,7 @@ }, initPublish(lessonId){ getPublishLesson3dData(lessonId).then(data => { - console.log(data); + // console.log(data); this.netData.name = data.data.name; this.netData.type = data.data.type; @@ -447,7 +447,7 @@ this.netData.data = JSON.stringify(saveData); // console.log(); updateLesson3dData(this.$route.query.lessonId,this.netData).then(data => { - console.log(data); + // console.log(data); }).catch(() => { }); }, diff --git a/src/views/jlmap3d/otherproject/xzexam/xzexam.vue b/src/views/jlmap3d/otherproject/xzexam/xzexam.vue index 2fd83d5b8..7e4d6155d 100644 --- a/src/views/jlmap3d/otherproject/xzexam/xzexam.vue +++ b/src/views/jlmap3d/otherproject/xzexam/xzexam.vue @@ -210,6 +210,12 @@ export default { name: "列车回库", type: "1", pic: '/other/7.png', + }, + { + id: "26", + name: "列车运行", + type: "1", + pic: '/other/26.png', } ], @@ -224,7 +230,7 @@ export default { }, mounted() { getSelectLesson3dList().then(response => { - console.log(response); + // console.log(response); // this.lessonData = response.data; }).catch(() => {}); }, diff --git a/static/other/yx.png b/static/other/26.png similarity index 100% rename from static/other/yx.png rename to static/other/26.png