joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

修改三维编辑器

Browse Source
This commit is contained in:
sunzhenyu 2021-10-21 16:59:03 +08:00
parent 287af31db5
commit 2792cafd3a
6 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jlmap3d/lesson3d/lesson3dplayer.js
View File

@ -18,6 +18,7 @@ import { AnimateManager } from '@/jlmap3d/lesson3d/manager/animatemanager.js';
import { Fire } from '@/jlmap3d/lesson3d/utils/fire.js';
import { Loading } from 'element-ui';
// import { AnimationManager } from '@/jlmap3d/lesson3d/manager/assetmodelmanager.js';
@ -58,6 +59,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
let controlManager = new ControlManager( dom,scene,lessonData,lessonIndex);
let loadingInstance = Loading.service({ fullscreen: true });
let assetModelManager = new AssetModelManager(scope,scene,controlManager);
assetModelManager.lessonAssetsLoader(lessonData).then((result) => {
scope.nowSceneType = lessonData.lessonProgress[0].progressScene;
@ -68,6 +70,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) {
startLesson();
animate();
loadingInstance.close();
resolve("loadeend"); //['成功了', 'success']
}).catch((error) => {
//console.log(error);

9
src/jlmap3d/lesson3d/manager/controlmanager.js
View File

@ -235,7 +235,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
this.init = function(actions,assetModelManager,trainDeviceData){
// worldOctree.fromGraphNode( standstationPZ );
actionList = actions;
console.log(actionList);
// console.log(actionList);
modelManager = assetModelManager;
if(trainDeviceData){
trainDeviceMode = true;
@ -351,7 +351,7 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
if(raycasterBoxs.length>0){
let isOverEvent = false;
let overEvent = "";
console.log(raycasterBoxs);
// console.log(raycasterBoxs);
for(let i=0;i<raycasterBoxs.length;i++){
if(raycasterBoxs[i].actionStatus == "0"){
@ -572,11 +572,6 @@ export function ControlManager(dom,scene,lessonData,lessonIndex) {
worldOctree.fromGraphNode( occPZ );
}
console.log(lessonData.lessonProgress[nowLessonIndex].changeCamera);
console.log(lessonData.lessonProgress[nowLessonIndex].roleName)
console.log(nowRole)
console.log(lessonData.lessonProgress[nowLessonIndex]);
if((lessonData.lessonProgress[nowLessonIndex].changeCamera == true && lessonData.lessonProgress[nowLessonIndex].roleName == nowRole) || nowLessonIndex == 0 || lessonData.lessonProgress[nowLessonIndex].roleName== 'kong'){

2
src/jlmap3d/lesson3d/model/lessondata.js
View File

@ -70,7 +70,7 @@ export function LessonData() {
}
this.loadLessonProgress = function(loadData){
console.log(loadData);
// console.log(loadData);
for(let i=0;i<loadData.length;i++){
let newLessonProgress = {
id:loadData[i].id,

12
src/views/jlmap3d/lesson3dplayer/lesson3dselect.vue
View File

@ -16,19 +16,19 @@
<div class="lesson3dSelectButton"
:style="{'background-image': 'url('+localStatic+'/texture/scene.png)'}"
style="left:20%;top:40%;" @click="enterPlayer">单对屏蔽门无法开启</div>
style="left:20%;top:40%;" @click="enterPlayer(38)">单个屏蔽门无法开启</div>
<div class="lesson3dSelectButton"
:style="{'background-image': 'url('+localStatic+'/texture/scene.png)'}"
style="left:60%;top:40%;" >单对屏蔽门无法关闭</div>
style="left:60%;top:40%;" @click="enterPlayer(39)">单个屏蔽门无法关闭</div>
<div class="lesson3dSelectButton"
:style="{'background-image': 'url('+localStatic+'/texture/scene.png)'}"
style="left:20%;top:70%;" >整列屏蔽门无法开启</div>
style="left:20%;top:70%;" @click="enterPlayer(36)">整侧屏蔽门无法开启</div>
<div class="lesson3dSelectButton"
:style="{'background-image': 'url('+localStatic+'/texture/scene.png)'}"
style="left:60%;top:70%;" >整列屏蔽门无法关闭</div>
style="left:60%;top:70%;" @click="enterPlayer(37)">整侧屏蔽门无法关闭</div>
</div>
</div>
@ -70,12 +70,12 @@ export default {
},
methods: {
enterPlayer:function ( ) {
enterPlayer:function (lessonid) {
let examcode = 0;
if(this.examMode == true){
examcode = 1;
}
this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId:'34',examMode:examcode} });
this.$router.push({ path: '/design/jlmap3d/lesson3dplayer', query: {lessonId:lessonid,examMode:examcode} });
},
}

6
src/views/jlmap3d/lesson3dplayer/tools/jobpane.vue
View File

@ -95,10 +95,10 @@
},
selsectJobTool(selectTool){
console.log(selectTool);
// console.log(selectTool);
let nowProgress = this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex];
console.log(nowProgress.id);
console.log(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]);
// console.log(nowProgress.id);
// console.log(this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex]);
if(selectTool.sceneId == nowProgress.id && this.lessonData.lessonData.lessonProgress[this.lessonPlayIndex].roleName == this.nowRole){
jumpEvent("tools",selectTool);
}

2
src/views/jlmap3d/lesson3dplayer/tools/resulttips.vue
View File

@ -56,7 +56,7 @@
methods: {
showdiv(){
this.divshow = true;
console.log(this.divshow);
// console.log(this.divshow);
},
closediv(){
this.divshow = false;