Parcourir la source

解禁unity-loader.js

nate il y a 3 ans
Parent
commit
74f815b6db
3 fichiers modifiés avec 33 ajouts et 16 suppressions
  1. 6 4
      C3/Index.php
  2. 24 12
      script/js/c3.js
  3. 3 0
      script/js/unity-loader.js

+ 6 - 4
C3/Index.php

@@ -161,7 +161,7 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 
 								</div>
 							</header>
-<!--
+
 							<div class="panel-body">
 								<div class="chart chart-unity">
 									<div id="unity-container" class="unity-desktop">
@@ -175,7 +175,7 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 									</div>
 								</div>
 							</div>
--->
+
 						</section>
 					</div>
 				</div>
@@ -218,7 +218,9 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 			</section>
 		</div>
 		<!-- Main-->
+		
 		<script src="/BIM-Monitor/script/js/c3.js"></script>
+		
 		<script>
 			vm.mount('.body');
 			addUserImage(userName.charAt(0), role);
@@ -265,9 +267,9 @@ include($_SERVER['DOCUMENT_ROOT'] . "/Authorization/script/php/permission/check_
 
 		<!-- <script src='/BIM-Monitor/script/js/warning.js'></script> -->
 		<!-- Unity loader -->
-<!--
 		<script src="/BIM-Monitor/script/js/unity-loader.js"></script>
--->
+		
+
 	</section>
 </body>
 

+ 24 - 12
script/js/c3.js

@@ -99,13 +99,16 @@ function LoadPage() {
     else
         document.getElementById("displayCompareChart").style.display = 'none';
 
-    if (option == "HM" || option == "SIS" || option == "RS" || option == "VG" || option == "SID") {
-        //myGameInstance.SendMessage("Monitor", "ChangeTransparent");
-        //myGameInstance.SendMessage("Monitor", "RemoveModel", "true");
-    } else {
-        //myGameInstance.SendMessage("Monitor", "ChangeWhite");
-        //myGameInstance.SendMessage("Monitor", "RemoveModel", "false");
+    if(isLoad){
+        if (option == "HM" || option == "SIS" || option == "RS" || option == "VG" || option == "SID") {
+            myGameInstance.SendMessage("Monitor", "ChangeTransparent");
+            myGameInstance.SendMessage("Monitor", "RemoveModel", "true");
+        } else {
+            myGameInstance.SendMessage("Monitor", "ChangeWhite");
+            myGameInstance.SendMessage("Monitor", "RemoveModel", "false");
+        }
     }
+    
 
     if (option != "ELP" && option != "SIS" && option != "SID") {
         document.getElementById("phase").style.display = "none";
@@ -119,9 +122,11 @@ function LoadPage() {
         dataValue = dataValue.concat(',', wellTBALocal[i]);
 
     }
-
-    //myGameInstance.SendMessage("Monitor", "AddDataTable", dataValue);
-    //myGameInstance.SendMessage("Monitor", "Initialization");
+    if(isLoad){
+        myGameInstance.SendMessage("Monitor", "AddDataTable", dataValue);
+        myGameInstance.SendMessage("Monitor", "Initialization");
+    }
+    
     var wellNameList = window.localStorage.getItem("wellNameList");
     var wellNameListsLocal = wellNameList.split(",");
 
@@ -171,7 +176,10 @@ function showWell(str, changeCamera) {
             saveCheckCompare = strLocal + "資料表";
             displayChart(str, "myChart");
             reset();
-            //myGameInstance.SendMessage("MainCamera", "GetDataFromWebGL", str);
+            if(isLoad){
+                myGameInstance.SendMessage("MainCamera", "GetDataFromWebGL", str);
+            }
+            
 
             if (!changeCamera) {
                 ResetCamera();
@@ -522,7 +530,9 @@ function displayCompareChart() {
 
 //Reset the camera
 function ResetCamera() {
-    //myGameInstance.SendMessage("MainCamera", "ResetCamera");
+    if(isLoad){
+        myGameInstance.SendMessage("MainCamera", "ResetCamera");
+    }
 }
 
 
@@ -585,7 +595,9 @@ function SetList() {
 }
 
 function UpdateGPS(GPS) {
-    //myGameInstance.SendMessage("PlayerArmature", "UpdateGPS", GPS);
+    if(isLoad){
+        myGameInstance.SendMessage("PlayerArmature", "UpdateGPS", GPS);
+    }
 }
 
 

+ 3 - 0
script/js/unity-loader.js

@@ -64,7 +64,9 @@ if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
 loadingBar.style.display = "block";
 var myGameInstance = null;
 var script = document.createElement("script");
+var isLoad = false;
 script.src = loaderUrl;
+
 script.onload = () => {
     createUnityInstance(canvas, config, (progress) => {
         progressBarFull.style.width = Math.round(100 * progress) + "%";
@@ -72,6 +74,7 @@ script.onload = () => {
     }).then((unityInstance) => {
         loadingBar.style.display = "none";
         myGameInstance = unityInstance;
+        isLoad = true;
     }).catch((message) => {
         alert(message);
     });