diff --git a/src/jlmap3d/lesson3d/lesson3dplayer.js b/src/jlmap3d/lesson3d/lesson3dplayer.js index fde797862..d3c4bc99b 100644 --- a/src/jlmap3d/lesson3d/lesson3dplayer.js +++ b/src/jlmap3d/lesson3d/lesson3dplayer.js @@ -16,7 +16,8 @@ import { ControlManager } from '@/jlmap3d/lesson3d/manager/controlmanager.js'; import { AnimateManager } from '@/jlmap3d/lesson3d/manager/animatemanager.js'; -import { Fire } from '@/jlmap3d/lesson3d/utils/fire.js'; + +import { AccidentManager } from '@/jlmap3d/lesson3dedit/manager/accidentmanager.js'; import { Loading } from 'element-ui'; @@ -50,18 +51,18 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { light.position.set( 0, 4000, 0 ); scene.add( light ); - // let fire = new Fire(); - // fire.init(scene); var audionext = JL3D_LOCAL_STATIC+'/lesson3d/audio/next.wav'; audionext = new Audio(audionext); - - let animateManager = new AnimateManager(); - let controlManager = new ControlManager( dom,scene,lessonData,lessonIndex); + let accidentManager = new AccidentManager(scene); + accidentManager.initAccident('player'); + if(lessonData.accidentList){ + accidentManager.loadAccidentList(lessonData.accidentList) + } let loadingInstance = Loading.service({ fullscreen: true }); let assetModelManager = new AssetModelManager(scope,scene,controlManager); @@ -119,6 +120,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { // console.log(lessonData.lessonProgress[lessonIndex].roleName); if(lessonData.lessonProgress[lessonIndex].roleName == nowRole){ assetModelManager.changeSceneGroup(scope.nowSceneType); + accidentManager.changeSceneGroup(scope.nowSceneType); controlManager.initRoleMode(true,nowRole); controlManager.initControlMode(lessonIndex); controlManager.changeIndexEvent(lessonData.lessonProgress[lessonIndex].action,true,assetModelManager.lessonTriggerList[scope.nowSceneType]); @@ -126,6 +128,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { } else{ if(lessonData.lessonProgress[lessonIndex].roleName == 'kong'){ assetModelManager.changeSceneGroup(scope.nowSceneType); + accidentManager.changeSceneGroup(scope.nowSceneType); controlManager.initRoleMode(false,nowRole); } controlManager.initRoleMode(false,nowRole); @@ -209,7 +212,7 @@ export function Lesson3dPlayer(dom,lessonData,lessonIndex) { if(controlManager.controlMode == "non"){ controlManager.updateOrbitControl(); } - // fire.update(); + accidentManager.update(); animateManager.updateAnimation(); requestAnimationFrame(animate); diff --git a/src/jlmap3d/lesson3dedit/manager/accidentmanager.js b/src/jlmap3d/lesson3dedit/manager/accidentmanager.js index f435b52f6..8f7ec6caa 100644 --- a/src/jlmap3d/lesson3dedit/manager/accidentmanager.js +++ b/src/jlmap3d/lesson3dedit/manager/accidentmanager.js @@ -6,6 +6,7 @@ export function AccidentManager(scene) { this.accidentList = []; + this.accidentMode = ''; this.accidentGroup = new THREE.Group(); //场景中可触发事件模型 @@ -32,7 +33,7 @@ export function AccidentManager(scene) { scene.add(scope.accidentGroup); - this.initAccident = function(nowSceneType){ + this.initAccident = function(type){ let accidentData = [ { id:'1', @@ -40,7 +41,12 @@ export function AccidentManager(scene) { type:"fire" } ]; - jl3dUpdateAccidentData(accidentData); + scope.accidentMode = type; + if(scope.accidentMode == 'player'){ + + }else{ + jl3dUpdateAccidentData(accidentData); + } } this.saveDataList = function(){ @@ -72,7 +78,11 @@ export function AccidentManager(scene) { scope.accidentGroup.remove(scope.accidentGroup.children[0]); } scope.accidentGroup.add(groupList[nowSceneType]); - jl3dUpdateAccidentlist(scope.accidentList[nowSceneType]); + if(scope.accidentMode == 'player'){ + + }else{ + jl3dUpdateAccidentlist(scope.accidentList[nowSceneType]); + } updateSceneType = nowSceneType; } @@ -95,7 +105,11 @@ export function AccidentManager(scene) { newAccident.object.createNew(groupList[nowSceneType],pos); } scope.accidentList[nowSceneType].push(newAccident); - jl3dUpdateAccidentlist(scope.accidentList[nowSceneType]); + if(scope.accidentMode == 'player'){ + + }else{ + jl3dUpdateAccidentlist(scope.accidentList[nowSceneType]); + } } this.deleteAccident = function(selectAccident,nowSceneType){ @@ -104,7 +118,11 @@ export function AccidentManager(scene) { for(let i=0;i +
+
+
+ + 城市轨道交通标准化培训软件 + + + 课程模式选择: + + + +
-
-
-
- - 城市轨道交通标准化培训软件 - - - 课程模式选择: - - - -
-
- + + + +
+ + + +
+ + + +
+ + + + + + -
-
- - 退出 - -
-
- -
+
+
+ + 退出 + +
+
+ diff --git a/static/other/10.png b/static/other/10.png new file mode 100644 index 000000000..940b7c913 Binary files /dev/null and b/static/other/10.png differ diff --git a/static/other/11.png b/static/other/11.png new file mode 100644 index 000000000..056bb798a Binary files /dev/null and b/static/other/11.png differ diff --git a/static/other/12.png b/static/other/12.png new file mode 100644 index 000000000..a2ef9b58d Binary files /dev/null and b/static/other/12.png differ diff --git a/static/other/13.png b/static/other/13.png new file mode 100644 index 000000000..5baef62c4 Binary files /dev/null and b/static/other/13.png differ diff --git a/static/other/jy.png b/static/other/14.png similarity index 100% rename from static/other/jy.png rename to static/other/14.png diff --git a/static/other/15.png b/static/other/15.png new file mode 100644 index 000000000..2f9d718f6 Binary files /dev/null and b/static/other/15.png differ diff --git a/static/other/17.png b/static/other/17.png new file mode 100644 index 000000000..5e6294ba4 Binary files /dev/null and b/static/other/17.png differ diff --git a/static/other/18.png b/static/other/18.png new file mode 100644 index 000000000..355579a12 Binary files /dev/null and b/static/other/18.png differ diff --git a/static/other/19.png b/static/other/19.png new file mode 100644 index 000000000..2ea5c907a Binary files /dev/null and b/static/other/19.png differ diff --git a/static/other/zf.png b/static/other/2.png similarity index 100% rename from static/other/zf.png rename to static/other/2.png diff --git a/static/other/20.png b/static/other/20.png new file mode 100644 index 000000000..f565e3e4f Binary files /dev/null and b/static/other/20.png differ diff --git a/static/other/21.png b/static/other/21.png new file mode 100644 index 000000000..c2a42a9cc Binary files /dev/null and b/static/other/21.png differ diff --git a/static/other/22.png b/static/other/22.png new file mode 100644 index 000000000..d05672318 Binary files /dev/null and b/static/other/22.png differ diff --git a/static/other/23.png b/static/other/23.png new file mode 100644 index 000000000..77b414aaf Binary files /dev/null and b/static/other/23.png differ diff --git a/static/other/24.png b/static/other/24.png new file mode 100644 index 000000000..05f37a475 Binary files /dev/null and b/static/other/24.png differ diff --git a/static/other/25.png b/static/other/25.png new file mode 100644 index 000000000..8c5d2ef6d Binary files /dev/null and b/static/other/25.png differ diff --git a/static/other/ck.png b/static/other/4.png similarity index 100% rename from static/other/ck.png rename to static/other/4.png diff --git a/static/other/5.png b/static/other/5.png new file mode 100644 index 000000000..0abbb3bd1 Binary files /dev/null and b/static/other/5.png differ diff --git a/static/other/6.png b/static/other/6.png new file mode 100644 index 000000000..47dcc36af Binary files /dev/null and b/static/other/6.png differ diff --git a/static/other/hk.png b/static/other/7.png similarity index 100% rename from static/other/hk.png rename to static/other/7.png diff --git a/static/other/8.png b/static/other/8.png new file mode 100644 index 000000000..2a00400ee Binary files /dev/null and b/static/other/8.png differ diff --git a/static/other/9.png b/static/other/9.png new file mode 100644 index 000000000..0f755789c Binary files /dev/null and b/static/other/9.png differ