添加楼梯定位设备编号配置

Assets/Scripts/ANet/PathFinding.cs

@@ -64,9 +64,9 @@ public class PathFinding : MonoBehaviour
     public Vector3 ConversionTransform(LocationData data)
     {
         //判断数据被检测到的区域
-        string St1 = "1";//楼梯入口基站
-        string St2 = "2";//楼梯间基站
-        string St3 = "3";//楼梯底层基站
+        string St1 = Config.LTTopCode;//楼梯入口基站
+        string St2 = Config.LTMidCode;//楼梯间基站
+        string St3 = Config.LTBottomCode;//楼梯底层基站
         //纠正坐标
         Vector3 p1 = new Vector3(-15.48f, -17.7f, 41.83f);//1.7
         Vector3 p2 = new Vector3(-15.48f, -19.3f, 37.48f);//1.4
@@ -78,20 +78,59 @@ public class PathFinding : MonoBehaviour
         var pos = new Vector3((float)data.xAxis, y, (float)data.zAxis);
         if (data.stations.Contains(St3) && !data.stations.Contains(St2))
         { //-5地面高度-21.1f
-            pos.y = -21.1f;
+            pos.y = p4.y;
         }
         else if (data.stations.Contains(St1) && data.stations.Contains(St2))
         { //-4到-5楼梯上半段
+            if (pos.x < p1.x - 0.8 || pos.x > p1.x + 0.8)
+            {
+                pos.x = p1.x;
+            }
+            if (pos.z > p1.z)
+            {
+                pos.z = p1.z;
+            }
+            if (pos.z < p2.z)
+            {
+                pos.z = p2.z;
+            }
+
             pos.y = SetY(pos);
         }
         else if (data.stations.Contains(St2) && data.stations.Contains(St3))
         {   //-4到-5楼梯下半段
+            if (pos.x < p3.x - 0.8 || pos.x > p3.x + 0.8)
+            {
+                pos.x = p3.x;
+            }
+            if (pos.z > p4.z)
+            {
+                pos.z = p4.z;
+            }
+            if (pos.z < p3.z)
+            {
+                pos.z = p3.z;
+            }
+
             pos.y = SetY(pos);
         }
         else if (data.stations.Contains(St2) && !data.stations.Contains(St1) && !data.stations.Contains(St3))
         {
             //-4到-5楼梯间过度
-            pos.y = -19.3f;
+            if (pos.z < p3.z - 0.4 || pos.z > p3.z + 0.4)
+            {
+                pos.z = p3.z;
+            }
+            if (pos.x > p2.x)
+            {
+                pos.x = p2.x;
+            }
+            if (pos.x < p3.x)
+            {
+                pos.x = p3.x;
+            }
+
+            pos.y = p3.y;
         }
 
         return pos;
@@ -115,11 +154,11 @@ public class PathFinding : MonoBehaviour
             }
         }
 
-        if (Physics.Raycast(position, Vector3.down, out hit, 100f, 15))
-        {
-            // 如果射线击中地面，设置Y轴为地面高度
-            return hit.point.y;
-        }
+        //if (Physics.Raycast(position, Vector3.down, out hit, 100f, 15))
+        //{
+        //    // 如果射线击中地面，设置Y轴为地面高度
+        //    return hit.point.y;
+        //}
         return 0f;
     }
 }

Assets/Scripts/Common/GameManager.cs

@@ -49,6 +49,9 @@ public class GameManager : Singleton<GameManager>
                 Config.Range = webConfig.Range;
                 Config.Interval = webConfig.Interval;
                 Config.MapId = webConfig.MapId;
+                Config.LTTopCode = webConfig.LTTopCode;
+                Config.LTMidCode = webConfig.LTMidCode;
+                Config.LTBottomCode = webConfig.LTBottomCode;
                 Config.AlarmServer = webConfig.AlarmServer;
                 Config.AlarmInterval = webConfig.AlarmInterval;
                 Debug.Log("ServerAddress:" + Config.ServerAddress + " Interval:" + Config.Interval + " Range:" + Config.Range);

Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs

@@ -257,12 +257,23 @@ public class LocationSimulator : MonoBehaviour
     /// <returns></returns>
     public float SetY(Vector3 position)
     {
-        RaycastHit hit;
-        if (Physics.Raycast(position, Vector3.down, out hit, Mathf.Infinity, LayerMask.NameToLayer("Stair")))
+        //RaycastHit hit;
+
+        var hitlist = Physics.RaycastAll(position, Vector3.down, 100f, ~(1 << (LayerMask.NameToLayer("Defaut") | LayerMask.NameToLayer("Hidden"))));
+        if (hitlist.Length > 0)
         {
-            // 如果射线击中地面，设置Y轴为地面高度
-            return hit.point.y;
+            foreach (var item in hitlist)
+            {
+                if (item.transform.gameObject.layer == LayerMask.NameToLayer("Stair"))
+                    return item.point.y;
+            }
         }
+
+        //if (Physics.Raycast(position, Vector3.down, out hit, 100f, 15))
+        //{
+        //    // 如果射线击中地面，设置Y轴为地面高度
+        //    return hit.point.y;
+        //}
         return 0f;
     }
 
@@ -314,34 +325,73 @@ public class LocationSimulator : MonoBehaviour
     public Vector3 ConversionTransform(LocationData data)
     {
         //判断数据被检测到的区域
-        string St1 = "106";//楼梯入口基站
-        string St2 = "107";//楼梯间基站
-        string St3 = "108";//楼梯底层基站
+        string St1 = Config.LTTopCode;//楼梯入口基站
+        string St2 = Config.LTMidCode;//楼梯间基站
+        string St3 = Config.LTBottomCode;//楼梯底层基站
         //纠正坐标
-        Vector3 p1 = new Vector3(-15.48f, -17.7f, 41.83f);//1.7
-        Vector3 p2 = new Vector3(-15.48f, -19.3f, 37.48f);//1.4
-        Vector3 p3 = new Vector3(-17.47f, -19.3f, 37.48f);//1.4
-        Vector3 p4 = new Vector3(-17.47f, -21.1f, 42.42f);//1.7
+        Vector3 p1 = new Vector3(-15.48f, -17.7f, 41.83f);//0.8
+        Vector3 p2 = new Vector3(-15.48f, -19.3f, 37.48f);//0.4
+        Vector3 p3 = new Vector3(-17.47f, -19.3f, 37.48f);//0.4
+        Vector3 p4 = new Vector3(-17.47f, -21.1f, 42.42f);//0.8
         //换算最终位置
         //-4地面高度-17.7f
-        float y = -17.7f;
+        float y = p1.y;
         var pos = new Vector3(-((float)data.xAxis - offsetX), y, -((float)data.yAxis - offsetZ));
         if (data.stations.Contains(St3) && !data.stations.Contains(St2))
         { //-5地面高度-21.1f
-            pos.y = -21.1f;
+            pos.y = p4.y;
         }
         else if (data.stations.Contains(St1) && data.stations.Contains(St2))
         { //-4到-5楼梯上半段
+            if (pos.x < p1.x - 0.8 || pos.x > p1.x + 0.8)
+            {
+                pos.x = p1.x;
+            }
+            if (pos.z > p1.z)
+            {
+                pos.z = p1.z;
+            }
+            if (pos.z < p2.z)
+            {
+                pos.z = p2.z;
+            }
+
             pos.y = SetY(pos);
         }
         else if (data.stations.Contains(St2) && data.stations.Contains(St3))
         {   //-4到-5楼梯下半段
+            if (pos.x < p3.x - 0.8 || pos.x > p3.x + 0.8)
+            {
+                pos.x = p3.x;
+            }
+            if (pos.z > p4.z)
+            {
+                pos.z = p4.z;
+            }
+            if (pos.z < p3.z)
+            {
+                pos.z = p3.z;
+            }
+
             pos.y = SetY(pos);
         }
         else if (data.stations.Contains(St2) && !data.stations.Contains(St1) && !data.stations.Contains(St3))
         {
             //-4到-5楼梯间过度
-            pos.y = -19.3f;
+            if (pos.z < p3.z - 0.4 || pos.z > p3.z + 0.4)
+            {
+                pos.z = p3.z;
+            }
+            if (pos.x > p2.x)
+            {
+                pos.x = p2.x;
+            }
+            if (pos.x < p3.x)
+            {
+                pos.x = p3.x;
+            }
+
+            pos.y = p3.y;
         }
 
         return pos;

Assets/Scripts/Manager/Config.cs

@@ -27,13 +27,25 @@ public static class Config
     /// </summary>
     public static string MapId { get; set; }
     /// <summary>
+    /// 人员定位楼梯上层定位设备code
+    /// </summary>
+    public static string LTTopCode { get; set; }
+    /// <summary>
+    /// 人员定位楼梯楼梯间定位设备code
+    /// </summary>
+    public static string LTMidCode { get; set; }
+    /// <summary>
+    /// 人员定位楼梯下层定位设备code
+    /// </summary>
+    public static string LTBottomCode { get; set; }
+    /// <summary>
     /// 人员定位报警接口
     /// </summary>
     public static string AlarmServer { get; set; }
     /// <summary>
     /// 人员定位摄像头
     /// </summary>
-    public static string PersonnelVideoUrl {  get; set; }
+    public static string PersonnelVideoUrl { get; set; }
     /// <summary>
     /// 定位标签
     /// </summary>
@@ -79,6 +91,18 @@ public class ConfigWebGL
     /// </summary>
     public string MapId { get; set; }
     /// <summary>
+    /// 人员定位楼梯上层定位设备code
+    /// </summary>
+    public string LTTopCode { get; set; }
+    /// <summary>
+    /// 人员定位楼梯楼梯间定位设备code
+    /// </summary>
+    public string LTMidCode { get; set; }
+    /// <summary>
+    /// 人员定位楼梯下层定位设备code
+    /// </summary>
+    public string LTBottomCode { get; set; }
+    /// <summary>
     /// 人员定位报警接口
     /// </summary>
     public string AlarmServer { get; set; }
@@ -89,7 +113,7 @@ public class ConfigWebGL
     /// <summary>
     /// 定位标签
     /// </summary>
-    public List<string> Tags { get; set; }= new List<string>();
+    public List<string> Tags { get; set; } = new List<string>();
     /// <summary>
     /// 定位数据范围
     /// </summary>

Assets/StreamingAssets/Config.json

@@ -5,7 +5,10 @@
   "CompanyName": "凯德龙之梦",
   "LocationServer": "http://101.201.70.191:8080",
   "AlarmServer":"http://101.201.70.191:8080",
-  "MapId":"4",
+  "MapId":"8",
+  "LTTopCode":"1",
+  "LTMidCode":"2",
+  "LTBottomCode":"3",
   "PersonnelVideoUrl":"https://demo.unified-streaming.com/k8s/features/stable/video/tears-of-steel/tears-of-steel.ism/.m3u8",
   "Tags": ["10671050","10671051","10671052","10671053","10671054","10671057","10671058","10671059","10671061","10671064"],
   "Interval":1,