Bug396、397、398

Assets/Scripts/Blue/Controller/ImmersalLocalControl.cs

@@ -9,7 +9,6 @@ using UnityEngine.UI;
 public class ImmersalLocalControl : AbstractController
 {
     private XRLocalizer XRLocalizer =>SceneIOCContainer.Instance.Pull("XRLocalizer")as XRLocalizer;
-    private ImmersalLocalizerController ImmersalLocalizerController =>SceneIOCContainer.Instance.Pull("ImmersalLocalizerController")as ImmersalLocalizerController;
     private Toggle Y_Location_Toggle =>SceneIOCContainer.Instance.Pull("Y_Location_Toggle")as Toggle;
     private Toggle N_Location_Toggle =>SceneIOCContainer.Instance.Pull("N_Location_Toggle")as Toggle;
     public int id;
@@ -30,19 +29,17 @@ public class ImmersalLocalControl : AbstractController
             return;
         }
 
-        Debug.LogError("是否定位："+isOn);
+        Debug.LogError($"{name}是否定位："+isOn);
         if(isOn)
         {
             // 启动脚本，开启定位
             Y_Location_Toggle.isOn = true;
             XRLocalizer.enabled = true;
-            ImmersalLocalizerController.enabled = true;
         }
         else
         {
             N_Location_Toggle.isOn = true;
             XRLocalizer.enabled = false;
-            ImmersalLocalizerController.enabled = false;
         }
         this.RegisterEvent<SetImmersalLocalEvent>(Unload);
     }

Assets/Scripts/Blue/Controller/ImmersalLocalizerController.cs

@@ -30,6 +30,7 @@ public class ImmersalLocalizerController: AbstractController
                     "定位成功");
             this.SendCommand(Command);
 
+            N_Location_Toggle.isOn = true;
             Y_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = white;
             Y_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = white;
             N_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = blue;

Assets/Scripts/Blue/Controller/IsLocation.cs

@@ -40,6 +40,11 @@ public class IsLocation : AbstractController
     {
         if (isOn)
         {
+            Y_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = white;
+            Y_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = white;
+            N_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = blue;
+            N_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = blue;
+
             XRLocalizer.enabled = false;
 
             this.SendCommand(new SetImmersalLocalCommand(false));

Assets/Scripts/Blue/System/GetObjectSystem.cs

@@ -12,6 +12,8 @@ public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
 
     [SerializeField] private Toggle Y_Location_Toggle;
     [SerializeField] private Toggle N_Location_Toggle;
+
+    [SerializeField] private ImmersalLocalizerController ImmersalLocalizerController;
     private void Awake()
     {
         GetObj();
@@ -26,6 +28,7 @@ public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
         AnchorBtnToggle = GameObject.Find("SetBtn/Canvas/Parent/AnchorBtn/Toggle").GetComponent<Toggle>();
         Y_Location_Toggle = GameObject.Find("SetBtn/Canvas").transform.Find("LocationPanel/Toggle/Y_Location_Toggle").GetComponent<Toggle>();
         N_Location_Toggle = GameObject.Find("SetBtn/Canvas").transform.Find("LocationPanel/Toggle/N_Location_Toggle").GetComponent<Toggle>();
+        ImmersalLocalizerController = transform.GetComponentInChildren<ImmersalLocalizerController>();
     }
 
     private void PushIOC()
@@ -36,5 +39,6 @@ public class GetObjectSystem : SingletonMonobehaviour<GetObjectSystem>
         SceneIOCContainer.Instance.Push("AnchorBtnToggle",AnchorBtnToggle);
         SceneIOCContainer.Instance.Push("Y_Location_Toggle",Y_Location_Toggle);
         SceneIOCContainer.Instance.Push("N_Location_Toggle",N_Location_Toggle);
+        SceneIOCContainer.Instance.Push("ImmersalLocalizerController",ImmersalLocalizerController);
     }
 }

Assets/Scripts/UI/GameManager.cs

@@ -333,7 +333,7 @@ public class GameManager : MonoSingleton<GameManager>
         InitCrystals();
         InitBoxColliders();
 
-        ERNIEBot.SetActive(true);
+        //ERNIEBot.SetActive(true);
         CommandSystem.Instance.Send(new LoadMapFileCommand());
     }