From 059270c12f452fcc3344b826f35295fd7c20906e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 21 三月 2023 08:31:37 +0800
Subject: [PATCH] #

---
 static/js/app.js |   38 ++++++++++++++++++++++----------------
 1 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/static/js/app.js b/static/js/app.js
index 0520b6a..cf1bd8b 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -12,7 +12,7 @@
 import {StoreCrn} from './object/StoreCrn.js';
 import {StoreConvey} from './object/StoreConvey.js';
 import {StoreGoods} from './object/StoreGoods.js';
-
+import {StaTask} from './object/StaTask.js';
 
 var APP = {
 
@@ -25,8 +25,8 @@
 		this.firstTime = 1;
 		this.stats = null;
 		this.outlinePass = null;
-		this.goodTypes=[];//瀛樺偍鎵�鏈夌殑搴撲綅绫诲瀷
 		this.crnTasks = [];// 鍫嗗灈鏈哄垪琛�
+		this.staTasks = [];// 杈撻�佺嚎鍒楄〃
 		this.moveForward = false;//鏄惁鍚戝墠杩愯
 		this.moveBackward = false;//鏄惁鍚戝悗杩愯
 		this.moveLeft = false;//鏄惁鍚戝乏杩愯
@@ -72,6 +72,7 @@
 			this.stats.end();
 			this.queryCrn();
 			this.crnMove();
+			this.querySta();
 		}
 		this.initScene = function () {
 			this.scene = new THREE.Scene();
@@ -96,7 +97,7 @@
 			// this.renderer.toneMapping = THREE.CineonToneMapping;	// 鑹茶皟
 			this.renderer.setSize(window.innerWidth, window.innerHeight);
 			this.renderer.setPixelRatio( window.devicePixelRatio );
-			this.renderer.shadowMap.enabled = true;
+			// this.renderer.shadowMap.enabled = true;	// 鏄惁寮�鍚槾褰�
 			this.renderer.shadowMap.type = THREE.BasicShadowMap;
 			this.dom = document.getElementById("container");
 			this.dom.appendChild(this.renderer.domElement);
@@ -111,7 +112,7 @@
 			// 闃村奖鑱氬厜鐏�
 			let pointLight = new THREE.SpotLight(0xFFFAFA,1);
 			pointLight.position.set(0, 1500, 2500);
-			pointLight.castShadow = true;
+			// pointLight.castShadow = true; 	// 鏄惁寮�鍚槾褰�
 			pointLight.shadow.camera.near = 2000;
 			pointLight.shadow.camera.far = 10000;
 			pointLight.shadow.mapSize.height = 200000;
@@ -140,7 +141,7 @@
 				this.scene.background = new THREE.Color( 0x333333 );
 			} else {
 				const cubeTextureLoader = new THREE.CubeTextureLoader();
-				cubeTextureLoader.setPath( '../static/img/skybox0/' );
+				cubeTextureLoader.setPath( '../static/img/skybox/' );
 				this.scene.background = cubeTextureLoader.load([
 					"px.jpg", "nx.jpg",
 					"py.jpg", "ny.jpg",
@@ -177,7 +178,7 @@
 			this.composer.addPass( this.fxaaPass );
 		}
 		this.initObjectSelect = function(){
-			new ObjectSelect(this.scene, this.camera, this.outlinePass);
+			new ObjectSelect(this.scene, this.camera, this.outlinePass, this);
 		}
 		this.initPointLockControl = function(object){
 			this.controls = new PointerLockControls( this.camera, document.body );
@@ -356,20 +357,25 @@
 				}
 			}
 		}
-		this.getExistedGoodType=function(state){
-			for (let i=0;i<this.goodTypes.length;i++) {
-				let type=this.goodTypes[i];
-				if(type.type===state) {
-					return type.object;
-				}
-			}
-			return null;
-		}
-		this.crnMove = function (object) {
+		this.crnMove = function () {
 			for (let crnTask of this.crnTasks) {
 				crnTask.move();
 			}
 		}
+		this.querySta = function () {
+			if (StaDatas !== null && this.firstTime === 0) {
+				for (let staData of StaDatas) {
+					let staTask = getArrVal(this.staTasks, "no", staData.no);
+					if (null == staTask) {
+						this.staTasks.push(new StaTask(staData, this));
+					} else {
+						if(!staTask.run && !staTask.isDel) {
+							staTask.modify(staData);
+						}
+					}
+				}
+			}
+		}
 
 		// 鍔熻兘鏂规硶鍖�
 		this.changeStats = function () {

--
Gitblit v1.9.1