From 1e537df7699ddb11f2a08d1116f107b160299ea6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 11 四月 2024 09:48:18 +0800
Subject: [PATCH] fix:合并冲突问题
---
src/views/screen/components/screen-map-three/experience/world/world.js | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/views/screen/components/screen-map-three/experience/world/world.js b/src/views/screen/components/screen-map-three/experience/world/world.js
index 1b2690f..9ec2b12 100644
--- a/src/views/screen/components/screen-map-three/experience/world/world.js
+++ b/src/views/screen/components/screen-map-three/experience/world/world.js
@@ -1,4 +1,5 @@
import EventEmitter from '../utils/eventEmitter';
+import Enviroment from './enviroment';
import Map from './map';
@@ -7,7 +8,8 @@
super();
this.experience = experience;
this.scene = this.experience.scene;
- this.Map = new Map(this.experience);
+ this.enviroment = new Enviroment(this.experience);
+ this.map = new Map(this.experience);
}
update() {
--
Gitblit v1.8.0