DGJ vor 1 Jahr
Ursprung
Commit
60139f66d2

+ 1 - 1
Assets/Prefab/Route/Materials/LineMat_1_High.mat

@@ -46,7 +46,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 0f32cd85f823fe84abe068e17c59e180, type: 3}
         m_Scale: {x: 1, y: 3}
-        m_Offset: {x: 0, y: -61.599346}
+        m_Offset: {x: 0, y: -72.74984}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

Datei-Diff unterdrückt, da er zu groß ist
+ 77 - 922
Assets/Scenes/LangChaoDemo2.unity


+ 7 - 7
Assets/Scripts/Managers/BladeServerManager.cs

@@ -174,22 +174,22 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
                     Debug.Log("FoundItem " + foundItem.transform.position + "  point" + point.transform.position + "  CA  " + new Vector3(point.transform.position.x - foundItem.transform.position.x, 0, point.position.z - foundItem.transform.position.z));
                     //foundItem.transform.Translate(new Vector3(0, point.eulerAngles.y, 0), Time.deltaTime * 10);
 
-                    //foundItem.transform.eulerAngles = new Vector3(0, point.eulerAngles.y, 0);
-                    //foundItem.transform.position = point.transform.position;
+                    foundItem.transform.eulerAngles = new Vector3(0, point.eulerAngles.y, 0);
+                    foundItem.transform.position = point.transform.position;
                     UICallManager.Instance.OnTrackfound(foundItem);
                     isSync = false;
 
 
 
-                    MachineRoomManager.Instance.transform.eulerAngles = new Vector3(MachineRoomManager.Instance.transform.eulerAngles.x, point.eulerAngles.y+180, MachineRoomManager.Instance.transform.eulerAngles.z);
+                    //MachineRoomManager.Instance.transform.eulerAngles = new Vector3(MachineRoomManager.Instance.transform.eulerAngles.x, point.eulerAngles.y+180, MachineRoomManager.Instance.transform.eulerAngles.z);
 
-                    MachineRoomManager.Instance.transform.position += new Vector3(point.transform.position.x - foundItem.transform.position.x, point.position.y - foundItem.transform.position.y, point.position.z - foundItem.transform.position.z);
+                    //MachineRoomManager.Instance.transform.position += new Vector3(point.transform.position.x - foundItem.transform.position.x, point.position.y - foundItem.transform.position.y, point.position.z - foundItem.transform.position.z);
 
-                    float offy = OpenXRCamera.Instance.transform.position.y - foundItem.transform.position.y;
+                    //float offy = OpenXRCamera.Instance.transform.position.y - foundItem.transform.position.y;
 
-                    offy = offy * 0.05f;
+                    //offy = offy * 0.05f;
 
-                    MachineRoomManager.Instance.transform.position += new Vector3(0, offy, 0);
+                    //MachineRoomManager.Instance.transform.position += new Vector3(0, offy, 0);
                 }
 
                

+ 11 - 11
Assets/Scripts/Managers/MachineRoomManager.cs

@@ -90,16 +90,16 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         listTagid.Add(36);
         listTagid.Add(38);
         listTagid.Add(41);
-        listTagid.Add(42);
-        listTagid.Add(43);
-        listTagid.Add(44);
-        listTagid.Add(50);
-        listTagid.Add(53);
-        listTagid.Add(55);
-        listTagid.Add(58);
-        listTagid.Add(61);
-        listTagid.Add(62);
-        listTagid.Add(64);
+        //listTagid.Add(42);
+        //listTagid.Add(43);
+        //listTagid.Add(44);
+        //listTagid.Add(50);
+        //listTagid.Add(53);
+        //listTagid.Add(55);
+        //listTagid.Add(58);
+        //listTagid.Add(61);
+        //listTagid.Add(62);
+        //listTagid.Add(64);
 
         //listTagid.Add(31);
         //listTagid.Add(61);
@@ -110,7 +110,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         //listTagid.Add(4361);
         //listTagid.Add(4364);
 
-        //  PlayerPrefs.DeleteAll();
+          PlayerPrefs.DeleteAll();
         if (PlayerPrefs.HasKey("MachineRoomData"))
         {
             string msg = PlayerPrefs.GetString("MachineRoomData");

+ 1 - 1
Assets/Scripts/Managers/WayFindingManager.cs

@@ -277,7 +277,7 @@ public class WayFindingManager : MonoSingleton<WayFindingManager>
             GameObject devicedoorName = GameObject.Instantiate(deviceName, MachineRoomManager.Instance.transform);
             devicedoorName.transform.localPosition = listPos[listPos.Count - 2];
             devicedoorName.transform.LookAt(lookPoint);
-            devicedoorName.transform.localPosition = machineObj.transform.localPosition + new Vector3(0, 1, 0);
+            devicedoorName.transform.localPosition = machineObj.transform.localPosition + new Vector3(0, 0, 0);
             listDeviceDoorName.Add(devicedoorName);
             devicedoorName.GetComponent<SettingDeviceName>().SettingName(machineObj.deviceParameters.deviceName);
         }

Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.