diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js index ce6aed257..c4d7230b6 100644 --- a/src/jlmap3d/lesson3d/lesson3dplayer.js +++ b/src/jlmap3d/lesson3d/lesson3dplayer.js @@ -94,10 +94,10 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){ controlManager.initControlMode(lessonIndex); controlManager.initRoleMode(true,nowRole); - controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,true); + controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,true,assetModelManager.lessonTriggerList[scope.nowSceneType]); }else{ controlManager.initRoleMode(false,nowRole); - controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,false); + controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,false,assetModelManager.lessonTriggerList[scope.nowSceneType]); } } @@ -117,7 +117,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { controlManager.initRoleMode(roleMode); console.log(assetModelManager); // if(lessonData.lessonProgress[lessonIndex].action.length>0){ - controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,roleMode,assetModelManager.lessonTriggerList); + controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,roleMode,assetModelManager.lessonTriggerList[scope.nowSceneType]); // } }; diff --git a/src/jlmap3d/lesson3d/manager/controlmanager.js b/src/jlmap3d/lesson3d/manager/controlmanager.js index 51aed9510..bbe821fcc 100644 --- a/src/jlmap3d/lesson3d/manager/controlmanager.js +++ b/src/jlmap3d/lesson3d/manager/controlmanager.js @@ -500,21 +500,21 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) { } this.changeIndexEvent = function(actions,rMode,lessonTriggerList){ - if(lessonTriggerList){ - eventTrigger = lessonTriggerList; - scope.eventHitMode = true; - } - console.log(actions); - console.log(rMode); + + eventTrigger = lessonTriggerList; + nowActions = actions; // let newEventBoxs = []; // eventBoxs = newEventBoxs; raycasterBoxs = []; roleMode = rMode; - console.log("changeIndex-----------------"); + console.log("---------changeIndex--------"); console.log(actions); console.log(roleMode); + console.log(eventTrigger); + console.log("----------------------------"); if(actions.length>0 && roleMode){ + scope.eventHitMode = true; for(let i=0;i