[完善]人员定位

12 months ago · 9a5789dd04
11 changed files with 25 additions and 25 deletions
--- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset
+++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset
@ -29,11 +29,14 @@ MonoBehaviour:
  m_ShaderBundleNaming: 0
  m_ShaderBundleCustomNaming: 
  m_MonoScriptBundleNaming: 0
+  m_CheckForContentUpdateRestrictionsOption: 0
  m_MonoScriptBundleCustomNaming: 
  m_RemoteCatalogBuildPath:
    m_Id: 
  m_RemoteCatalogLoadPath:
    m_Id: 
+  m_ContentStateBuildPathProfileVariableName: 
+  m_CustomContentStateBuildPath: 
  m_ContentStateBuildPath: 
  m_BuildAddressablesWithPlayerBuild: 2
  m_overridePlayerVersion: 
@ -79,16 +82,16 @@ MonoBehaviour:
      m_Name: BuildTarget
      m_InlineUsage: 0
    - m_Id: 7fc0283356a1e2c4e93a557c23a49695
-      m_Name: LocalBuildPath
+      m_Name: Local.BuildPath
      m_InlineUsage: 0
    - m_Id: 697bfab9adf903b4d94edab779471d3d
-      m_Name: LocalLoadPath
+      m_Name: Local.LoadPath
      m_InlineUsage: 0
    - m_Id: cf68557ac9a2f534791f136de507f431
-      m_Name: RemoteBuildPath
+      m_Name: Remote.BuildPath
      m_InlineUsage: 0
    - m_Id: a9d6f23b6de9d724aa47ef949582563a
-      m_Name: RemoteLoadPath
+      m_Name: Remote.LoadPath
      m_InlineUsage: 0
    m_ProfileVersion: 1
  m_LabelTable:
@ -123,6 +126,4 @@ MonoBehaviour:
    m_Settings: {fileID: 11400000}
    m_NextInstanceId: 0
    m_RegisteredServiceTypeRefs: []
-    m_GlobalProfileVariablesInfos:
-    - key: PrivateIpAddress
-      value: 192.168.1.34
+    m_PingTimeoutInMilliseconds: 5000
--- a/Assets/AddressableAssetsData/WebGL/addressables_content_state.bin
+++ b/Assets/AddressableAssetsData/WebGL/addressables_content_state.bin
--- a/Me/Characters/Character1.prefab
+++ b/Me/Characters/Character1.prefab
@ -3652,7 +3652,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2728067710616108587
 RectTransform:
  m_ObjectHideFlags: 0
--- a/Me/Characters/Character2.prefab
+++ b/Me/Characters/Character2.prefab
@ -729,7 +729,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1308495718387535865
 RectTransform:
  m_ObjectHideFlags: 0
--- a/Me/Characters/Character3.prefab
+++ b/Me/Characters/Character3.prefab
@ -938,7 +938,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &3216045419867727480
 RectTransform:
  m_ObjectHideFlags: 0
--- a/Me/Characters/Character4.prefab
+++ b/Me/Characters/Character4.prefab
@ -4141,7 +4141,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5390027276396768406
 RectTransform:
  m_ObjectHideFlags: 0
--- a/Me/Characters/Character5.prefab
+++ b/Me/Characters/Character5.prefab
@ -3764,7 +3764,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2419738418584790563
 RectTransform:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/MainScene.unity
+++ b/Assets/Scenes/MainScene.unity
@ -895,7 +895,7 @@ MonoBehaviour:
  y: 12.59996
  isDragEnabled: 1
  moveSpeed: 10
-  minHeight: -5
+  minHeight: -20
  maxHeight: 140
  isAutoRotate: 0
  RotSpeed: 5
--- a/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs
+++ b/Assets/Scripts/Main/Core/PersonnelLocation/AgentController.cs
@ -42,16 +42,16 @@ public class AgentController : MonoBehaviour
    /// <param name="data"></param>
    public void UpdatePosition(LocationData data)
    {
-        var pos =Main.LocationSimulator.ConversionTransform(data);
-        if (data.targetNo == 10774520)
-        {
-            var info = $"卡号:{data.targetNo} - 定位基站:{data.stations} - 位置{pos}";
-            Debug.Log(info);
-        }
+        //var pos =Main.LocationSimulator.ConversionTransform(data);
+        //if (data.targetNo == 10774520)
+        //{
+        //    var info = $"卡号:{data.targetNo} - 定位基站:{data.stations} - 位置{pos}";
+        //    Debug.Log(info);
+        //}
            
-        if (Vector3.Distance(transform.position, pos) < Config.Range)
-            return;
-        OnMoveTo(pos);
+        //if (Vector3.Distance(transform.position, pos) < Config.Range)
+        //    return;
+        //OnMoveTo(pos);
        ShowStatus(data.createdTime, targetNo);


--- a/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs
+++ b/Assets/Scripts/Main/Core/PersonnelLocation/LocationSimulator.cs
@ -221,8 +221,7 @@ public class LocationSimulator : MonoBehaviour

                            if (agentControllers.ContainsKey(data.targetNo))
                            {
-                                //agentControllers[data.targetNo].UpdatePosition(data);
-                                agentControllers[data.targetNo].enabled = false;
+                                agentControllers[data.targetNo].UpdatePosition(data);
                                agentControllers[data.targetNo].transform.position = Main.LocationSimulator.ConversionTransform(data);
                            }
                            else
--- a/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs
+++ b/Assets/Scripts/Main/Core/PersonnelLocation/WorkAIController.cs
@ -66,7 +66,7 @@ public class WorkAIController : MonoBehaviour
    {
        if (this.targetNo == targetNo)
        {
-            var pos = new Vector3(transform.position.x, 0.9f, transform.position.z);
+            var pos = new Vector3(transform.position.x, transform.position.y+0.9f, transform.position.z);
            CameraOrbit.Instance.SetCameraView(pos, 3f);
            SelectionManager.Instance.AddGameObjectToSelection(gameObject);
            if (isShow)