Browse Source

Manage Init 修改

Dai Guangjun 3 years ago
parent
commit
63a797bd30

+ 33 - 57
Assets/StreamingAssets/projectInfo.json

@@ -3,52 +3,8 @@
 	"registe": "ok",
 	"tagid": "ABD1234561",
 	"projectinfo": {
-		"area": 113.505,
-		"attractions": [{
-			"name": "Transformers",
-			"position": {
-				"X": 7.7,
-				"Y": 1.5,
-				"Z": -1
-			},
-			"triggerTs": 1619083272,
-			"visitcout": 200
-		}, {
-			"name": "Car",
-			"position": {
-				"X": 2.4,
-				"Y": 4.8,
-				"Z": 1.2
-			},
-			"triggerTs": 1620366594,
-			"visitcout": 485
-		}, {
-			"name": "Solar",
-			"position": {
-				"X": 13.6,
-				"Y": 4.8,
-				"Z": 1.2
-			},
-			"triggerTs": 1619083262,
-			"visitcout": 106
-		}, {
-			"name": "Library",
-			"position": {
-				"X": 11,
-				"Y": 1.3,
-				"Z": 1.2
-			},
-			"triggerTs": 1619404561,
-			"visitcout": 124
-		}],
-		"imageSize": {
-			"height": 800,
-			"width": 612
-		},
-		"locators": [],
-		"name": "????????????",
 		"navLines": [{
-			"name": "??????1",
+			"name": "line one",
 			"points": [{
 				"D": 90,
 				"MN": "Transformers",
@@ -60,8 +16,8 @@
 				"T": 1,
 				"TH": 1,
 				"TL": 2,
-				"X": 2,
-				"Y": 1.7,
+				"X": 2.0199999999999996,
+				"Y": 1.68,
 				"Z": 1.2
 			}, {
 				"T": 0,
@@ -87,6 +43,20 @@
 				"X": 2.4,
 				"Y": 4.8,
 				"Z": 1.2
+			}, {
+				"D": 90,
+				"MN": "Subway",
+				"MP": [{
+					"X": 6.5,
+					"Y": 2.7,
+					"Z": -1
+				}],
+				"T": 1,
+				"TH": 1,
+				"TL": 1,
+				"X": 5,
+				"Y": 4.8,
+				"Z": 1.2
 			}, {
 				"D": 90,
 				"MN": "Solar",
@@ -139,7 +109,7 @@
 				"Z": 1.2
 			}]
 		}, {
-			"name": "??????2",
+			"name": "line two",
 			"points": [{
 				"D": 270,
 				"MN": "Library",
@@ -190,6 +160,20 @@
 				"X": 13.6,
 				"Y": 4.8,
 				"Z": 1.2
+			}, {
+				"D": 90,
+				"MN": "Subway",
+				"MP": [{
+					"X": 6.5,
+					"Y": 2.7,
+					"Z": -1
+				}],
+				"T": 1,
+				"TH": 1,
+				"TL": 1,
+				"X": 5,
+				"Y": 4.8,
+				"Z": 1.2
 			}, {
 				"D": 90,
 				"MN": "Car",
@@ -229,14 +213,6 @@
 				"Y": 1.7,
 				"Z": 1.2
 			}]
-		}],
-		"projectId": "11",
-		"realSize": {
-			"height": 100,
-			"width": 50
-		},
-		"sentiment": "medium",
-		"tenant": "5fb33562e03a98778d6f0e8f",
-		"updateTs": 1617327798000
+		}]
 	}
 }

+ 1 - 1
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TeshMap.cs

@@ -133,7 +133,7 @@ public class TeshMap : MonoBehaviour
         {
             float x = Mathf.Abs(listPoint[i].localPosition.x - mapPointA.localPosition.x) / disX;
             float z = Mathf.Abs(listPoint[i].localPosition.z - mapPointA.localPosition.z) / disZ;
-            Debug.Log(Mathf.Abs(listPoint[i].localPosition.z - mapPointA.localPosition.z) + "   "+ disX);
+           // Debug.Log(Mathf.Abs(listPoint[i].localPosition.z - mapPointA.localPosition.z) + "   "+ disX);
             listPointPos.Add(new Vector3(z, x, 0));
         }
 

+ 8 - 7
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TestJsonManage.cs

@@ -117,7 +117,7 @@ public class TestJsonManage : MonoBehaviour
                 GameObject route = GameObject.Instantiate(meshRoute, routes.transform);
                 Vector3 endPos = new Vector3((float)data.points[j].X, 0, (float)data.points[j].Y);
                 Vector3 exitPos = new Vector3((float)data.points[j + 1].X, 0, (float)data.points[j + 1].Y);
-                Debug.Log(endPos + "   " + exitPos);      
+              //  Debug.Log(endPos + "   " + exitPos);      
                 route.GetComponent<TestRoute>().SetRoute(endPos, exitPos , Index);
                 route.SetActive(true);
 
@@ -185,22 +185,23 @@ public class TestJsonManage : MonoBehaviour
                     switch (data.navLines[i].points[j].MN)
                     {
                         case "Transformers":
-                            QueryBox("P6", data.navLines[i].points[j]);  
+                            QueryBox("Party", data.navLines[i].points[j]);  
                             break;
                         case "Car":
-                            QueryBox("P4Car", data.navLines[i].points[j]);
+                            QueryBox("Gongye", data.navLines[i].points[j]);
                             break;
                         case "Subway":
                             QueryBox("Subway", data.navLines[i].points[j]);
                             break;
 
                         case "Solar":
-                            QueryBox("QuestionContral", data.navLines[i].points[j]);
+                            QueryBox("Chemical", data.navLines[i].points[j]);
                             break;
                         case "Library":
-                            // 博物馆 前4个触发器改为一个触发器
-                            int index = 0;
-                            SettingBox(list_Box[list_Box.Count - 1], new Vector3((float)data.navLines[i].points[j].X, (float)data.navLines[i].points[j].Z, (float)data.navLines[i].points[j].Y));
+                            //// 博物馆 前4个触发器改为一个触发器
+                            //int index = 0;
+                            //SettingBox(list_Box[list_Box.Count - 1], new Vector3((float)data.navLines[i].points[j].X, (float)data.navLines[i].points[j].Z, (float)data.navLines[i].points[j].Y));
+                            QueryBox("Library", data.navLines[i].points[j]);
                             //foreach (MPItem item in data.navLines[i].points[j].MP)
                             //{
                             //    SettingBox(list_Obj[index++], item);

+ 1 - 1
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TestMapShow.cs

@@ -50,7 +50,7 @@ public class TestMapShow : MonoBehaviour
         listAllPoint.Add(canvas.GetComponent<Image>());
         for (int i = 0; i < list_Point.Count; i++)
         {
-            Debug.Log(list_Point[i]);
+         //   Debug.Log(list_Point[i]);
             Image newPoint = Instantiate(point, canvas);
             newPoint.GetComponent<RectTransform>().anchoredPosition = 
                 new Vector2(canvas.rect.width * list_Point[i].x, canvas.rect.height * list_Point[i].y);

+ 1 - 1
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TestRoute.cs

@@ -61,7 +61,7 @@ public class TestRoute : MonoBehaviour
             material = this.GetComponent<MeshRenderer>().material;
         this.endPos = endPos;
         this.exitPos = exitPos;
-        Debug.Log("Route    " + endPos + "    " + exitPos);
+     //   Debug.Log("Route    " + endPos + "    " + exitPos);
         transform.localScale += new Vector3(0, 0, Mathf.Abs(Vector3.Distance(endPos, exitPos)) / 20f);
         material.SetTextureScale("_MainTex", new Vector2(1, Mathf.Abs(Vector3.Distance(endPos, exitPos)) * 1.5f));
         Vector3 pos = endPos + (exitPos - endPos).normalized * (Vector3.Distance(endPos, exitPos));

File diff suppressed because it is too large
+ 309 - 387
Assets/XDKUnityCloudExamples/Demo/Scenes/Demo.unity


File diff suppressed because it is too large
+ 731 - 28
Assets/XDKUnityCloudExamples/Demo/Scenes/SlamDemo.2.unity


+ 1 - 1
Assets/XDKUnityCloudExamples/Demo/Scenes/Demo_JS.unity.meta → Assets/XDKUnityCloudExamples/Demo/Scenes/SlamDemo.2.unity.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4d4e2a352f9e8cd4187fddad4b404c23
+guid: 12d7444e98717454e8da8b5f818a6a1a
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 2 - 1
ProjectSettings/ProjectSettings.asset

@@ -644,7 +644,8 @@ PlayerSettings:
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
   webGLWasmStreaming: 0
-  scriptingDefineSymbols: {}
+  scriptingDefineSymbols:
+    1: UNITY_CCU;CURVEDUI_TMP
   platformArchitecture: {}
   scriptingBackend:
     Android: 1

Some files were not shown because too many files changed in this diff