机房痛苦改bug 33333

Assets/Scenes/LangChaoDemo2.unity

@@ -2025,7 +2025,7 @@ Transform:
   m_Children:
   - {fileID: 2085389668}
   m_Father: {fileID: 0}
-  m_RootOrder: 51
+  m_RootOrder: 50
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &122690070
 GameObject:
@@ -2392,7 +2392,7 @@ Transform:
   m_Children:
   - {fileID: 503826677}
   m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 37
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &183734197
 GameObject:
@@ -4033,7 +4033,7 @@ Transform:
   m_Children:
   - {fileID: 1428694659}
   m_Father: {fileID: 0}
-  m_RootOrder: 42
+  m_RootOrder: 41
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &307533891
 GameObject:
@@ -6262,7 +6262,7 @@ Transform:
   m_Children:
   - {fileID: 334138222}
   m_Father: {fileID: 0}
-  m_RootOrder: 40
+  m_RootOrder: 39
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &482153408
 GameObject:
@@ -10424,7 +10424,7 @@ Transform:
   m_Children:
   - {fileID: 1301454615}
   m_Father: {fileID: 0}
-  m_RootOrder: 46
+  m_RootOrder: 45
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &791758554
 GameObject:
@@ -11719,7 +11719,7 @@ Transform:
   m_Children:
   - {fileID: 1455474013}
   m_Father: {fileID: 0}
-  m_RootOrder: 52
+  m_RootOrder: 51
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &874439297
 GameObject:
@@ -12341,13 +12341,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 906004195}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_Father: {fileID: 1012225063}
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &906004197
 MonoBehaviour:
@@ -14234,7 +14234,7 @@ Transform:
   m_Children:
   - {fileID: 1007470594}
   m_Father: {fileID: 0}
-  m_RootOrder: 49
+  m_RootOrder: 48
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1007470593
 GameObject:
@@ -14405,6 +14405,7 @@ Transform:
   - {fileID: 1617127047}
   - {fileID: 1191395390}
   - {fileID: 1531761702}
+  - {fileID: 906004196}
   m_Father: {fileID: 0}
   m_RootOrder: 22
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -14672,7 +14673,7 @@ Transform:
   m_Children:
   - {fileID: 1195914728}
   m_Father: {fileID: 0}
-  m_RootOrder: 47
+  m_RootOrder: 46
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1038271688
 GameObject:
@@ -18311,7 +18312,7 @@ Transform:
   m_Children:
   - {fileID: 1674454061}
   m_Father: {fileID: 0}
-  m_RootOrder: 43
+  m_RootOrder: 42
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1341529265
 GameObject:
@@ -18859,7 +18860,7 @@ Transform:
   m_Children:
   - {fileID: 1767066921}
   m_Father: {fileID: 0}
-  m_RootOrder: 41
+  m_RootOrder: 40
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1353351977
 MonoBehaviour:
@@ -19794,7 +19795,7 @@ Transform:
   m_Children:
   - {fileID: 513072084}
   m_Father: {fileID: 0}
-  m_RootOrder: 48
+  m_RootOrder: 47
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1416708796
 GameObject:
@@ -19892,7 +19893,7 @@ Transform:
   m_Children:
   - {fileID: 337898556}
   m_Father: {fileID: 0}
-  m_RootOrder: 50
+  m_RootOrder: 49
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1417717206
 GameObject:
@@ -20251,7 +20252,7 @@ Transform:
   m_Children:
   - {fileID: 1764105085}
   m_Father: {fileID: 0}
-  m_RootOrder: 39
+  m_RootOrder: 38
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1428694658
 GameObject:
@@ -22471,14 +22472,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1617127046}
-  m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
-  m_LocalPosition: {x: -0.2, y: 0.5, z: -1}
+  m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -3, y: 0.5, z: -1}
   m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1012225063}
   m_RootOrder: 6
-  m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!23 &1617127049
 MeshRenderer:
   m_ObjectHideFlags: 0
@@ -23126,7 +23127,7 @@ Transform:
   m_Children:
   - {fileID: 66988797}
   m_Father: {fileID: 0}
-  m_RootOrder: 44
+  m_RootOrder: 43
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1713568285
 GameObject:
@@ -23887,7 +23888,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1746801817
 RectTransform:
   m_ObjectHideFlags: 0
@@ -25387,7 +25388,7 @@ Transform:
   m_Children:
   - {fileID: 634173867}
   m_Father: {fileID: 0}
-  m_RootOrder: 45
+  m_RootOrder: 44
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1909598945
 GameObject:

Assets/Scripts/Managers/BladeServerManager.cs

@@ -74,6 +74,7 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
     /// </summary>
     private bool state = false;
 
+    private int oldrow = -1;
 
     //public delegate void TrackingFound(DataItem tagobj);
     ///// <summary>
@@ -276,13 +277,29 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
         foundID = tracking.TrackId.ToString();
 
         Debug.Log("FoundID  "+ foundID);
-     //   UILogManager.Instance.SendLogText(2, foundID);
-        if (foundItem==null|| foundItem.tagId!= int.Parse( foundID))
+        //   UILogManager.Instance.SendLogText(2, foundID);
+
+        int row = SynPlayerTransform.Instance.GetRowCabinets();
+
+        bool orientation = SynPlayerTransform.Instance.GetOrientation();
+
+        if (orientation)
+        {
+            row += 1;
+        }
+        else
         {
-            QueryFoundItem(int.Parse(foundID));
+            row += 0;
+        }
+
+       
+        if (foundItem==null||foundItem.tagId!= tracking.TrackId || oldrow == -1 || oldrow != row)
+        {
+            oldrow = row;
+            QueryFoundItem(int.Parse(foundID));          
             isSync = true;
             WayFindingManager.Instance.CloseWayFind();
-          //  ScenesManager.Instance.showOffice(ScenesManager.SceneType.DeviceDetails);
+            //  ScenesManager.Instance.showOffice(ScenesManager.SceneType.DeviceDetails);
 
         }
     
@@ -320,13 +337,15 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
 
             if(orientation)
             {
-                row += 2;
+                row += 1;
             }
             else
             {
-                row += 1;
+                row += 0;
             }
             Debug.Log(row * MachineRoomManager.Instance.data.list + "   " + (row + 1) * MachineRoomManager.Instance.data.list);
+
+            
             for (int i = row*MachineRoomManager.Instance.data.list; i < (row+1)*MachineRoomManager.Instance.data.list; i++)
             {
                 Debug.Log("DGJ  ===> " + listTagTracking[i].tagId);
@@ -426,6 +445,8 @@ public class BladeServerManager : MonoSingleton<BladeServerManager>
                 foundItem = null;
                
             }
+
+           
         }
       
       

Assets/Scripts/Managers/MachineRoomManager.cs

@@ -80,7 +80,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
 
         listTagid = new List<int>();
         listTagid.Add(6);
-        listTagid.Add(16);
+        listTagid.Add(15);
         listTagid.Add(26);
         listTagid.Add(27);
         listTagid.Add(28);

Assets/Scripts/Managers/SynPlayerTransform.cs

@@ -15,7 +15,7 @@ public class SynPlayerTransform : MonoSingleton<SynPlayerTransform>
     {
         transform.eulerAngles = new Vector3(0, player.eulerAngles.y, 0);
         transform.position = new Vector3(player.position.x, 0, player.position.z);
-
+        UILogManager.Instance.text3.text = transform.localEulerAngles.y.ToString();
     }
 
     /// <summary>
@@ -25,11 +25,11 @@ public class SynPlayerTransform : MonoSingleton<SynPlayerTransform>
     public bool GetOrientation()
     {
 
-        if (Mathf.Abs(transform.localEulerAngles.y) > 90)
+        if (Mathf.Abs(transform.localEulerAngles.y) > 90&& Mathf.Abs(transform.localEulerAngles.y)<270)
         {
-            return false;
+            return true;
         }
-        return true;
+        return false;
     }
 
     /// <summary>

Assets/Scripts/Managers/WayFindingManager.cs

@@ -88,6 +88,8 @@ public class WayFindingManager : MonoSingleton<WayFindingManager>
     {
         leftLine.localPosition = leftPos;
         rightLine.localPosition = rightPos;
+
+        leftLine.localPosition = new Vector3(player.localPosition.x, leftLine.localPosition.y, leftLine.localPosition.z);
     }
 
     public void NavigatorServer(MachineObj serverItem)