StreamAsset添加配置

Assets/MRNavigatorPro.unity

@@ -2106,7 +2106,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1879206224}
+  m_Mesh: {fileID: 1567414654}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -7158,7 +7158,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.005154792
+      value: 0.00064156036
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -7288,7 +7288,7 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0031788445
+      value: -0.006361045
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -7405,6 +7405,170 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6426900a6d8892f4483ae2172d9abcc8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!43 &1567414654
+Mesh:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 10
+  m_SubMeshes:
+  - serializedVersion: 2
+    firstByte: 0
+    indexCount: 0
+    topology: 5
+    baseVertex: 0
+    firstVertex: 0
+    vertexCount: 0
+    localAABB:
+      m_Center: {x: 0, y: 0, z: 0}
+      m_Extent: {x: 0, y: 0, z: 0}
+  m_Shapes:
+    vertices: []
+    shapes: []
+    channels: []
+    fullWeights: []
+  m_BindPose: []
+  m_BoneNameHashes: 
+  m_RootBoneNameHash: 0
+  m_BonesAABB: []
+  m_VariableBoneCountWeights:
+    m_Data: 
+  m_MeshCompression: 0
+  m_IsReadable: 1
+  m_KeepVertices: 0
+  m_KeepIndices: 0
+  m_IndexFormat: 1
+  m_IndexBuffer: 
+  m_VertexData:
+    serializedVersion: 3
+    m_VertexCount: 0
+    m_Channels:
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 3
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    - stream: 0
+      offset: 0
+      format: 0
+      dimension: 0
+    m_DataSize: 0
+    _typelessdata: 
+  m_CompressedMesh:
+    m_Vertices:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UV:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Normals:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Tangents:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Weights:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_NormalSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_TangentSigns:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_FloatColors:
+      m_NumItems: 0
+      m_Range: 0
+      m_Start: 0
+      m_Data: 
+      m_BitSize: 0
+    m_BoneIndices:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_Triangles:
+      m_NumItems: 0
+      m_Data: 
+      m_BitSize: 0
+    m_UVInfo: 0
+  m_LocalAABB:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
+  m_MeshUsageFlags: 0
+  m_BakedConvexCollisionMesh: 
+  m_BakedTriangleCollisionMesh: 
+  m_MeshMetrics[0]: 1
+  m_MeshMetrics[1]: 1
+  m_MeshOptimizationFlags: 1
+  m_StreamData:
+    serializedVersion: 2
+    offset: 0
+    size: 0
+    path: 
 --- !u!1 &1573329411
 GameObject:
   m_ObjectHideFlags: 0
@@ -7959,6 +8123,12 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 8019606655629294614}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1637434298 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8221249705219883143, guid: 7e724082e3f166747b1152780155e212,
+    type: 3}
+  m_PrefabInstance: {fileID: 1420177103}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1662148595
 GameObject:
   m_ObjectHideFlags: 0
@@ -8867,170 +9037,6 @@ Transform:
   m_Father: {fileID: 210725851}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!43 &1879206224
-Mesh:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 10
-  m_SubMeshes:
-  - serializedVersion: 2
-    firstByte: 0
-    indexCount: 0
-    topology: 5
-    baseVertex: 0
-    firstVertex: 0
-    vertexCount: 0
-    localAABB:
-      m_Center: {x: 0, y: 0, z: 0}
-      m_Extent: {x: 0, y: 0, z: 0}
-  m_Shapes:
-    vertices: []
-    shapes: []
-    channels: []
-    fullWeights: []
-  m_BindPose: []
-  m_BoneNameHashes: 
-  m_RootBoneNameHash: 0
-  m_BonesAABB: []
-  m_VariableBoneCountWeights:
-    m_Data: 
-  m_MeshCompression: 0
-  m_IsReadable: 1
-  m_KeepVertices: 0
-  m_KeepIndices: 0
-  m_IndexFormat: 1
-  m_IndexBuffer: 
-  m_VertexData:
-    serializedVersion: 3
-    m_VertexCount: 0
-    m_Channels:
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 3
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    - stream: 0
-      offset: 0
-      format: 0
-      dimension: 0
-    m_DataSize: 0
-    _typelessdata: 
-  m_CompressedMesh:
-    m_Vertices:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UV:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Normals:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Tangents:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Weights:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_NormalSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_TangentSigns:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_FloatColors:
-      m_NumItems: 0
-      m_Range: 0
-      m_Start: 0
-      m_Data: 
-      m_BitSize: 0
-    m_BoneIndices:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_Triangles:
-      m_NumItems: 0
-      m_Data: 
-      m_BitSize: 0
-    m_UVInfo: 0
-  m_LocalAABB:
-    m_Center: {x: 0, y: 0, z: 0}
-    m_Extent: {x: 1.7014117e+38, y: 1.7014117e+38, z: 1.7014117e+38}
-  m_MeshUsageFlags: 0
-  m_BakedConvexCollisionMesh: 
-  m_BakedTriangleCollisionMesh: 
-  m_MeshMetrics[0]: 1
-  m_MeshMetrics[1]: 1
-  m_MeshOptimizationFlags: 1
-  m_StreamData:
-    serializedVersion: 2
-    offset: 0
-    size: 0
-    path: 
 --- !u!1 &1884715970
 GameObject:
   m_ObjectHideFlags: 0
@@ -10363,7 +10369,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0.0005066204
+      value: 0.0019329415
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -14209,7 +14215,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: -0.005229381}
+  m_AnchoredPosition: {x: 0, y: 0.0004350161}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118
@@ -15503,6 +15509,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7886070564954139972, guid: 73594541ba5ecf84680e516628f9f8a8,
+        type: 3}
+      propertyPath: LocalizeBtn
+      value: 
+      objectReference: {fileID: 1637434298}
     - target: {fileID: 7931960824797962037, guid: 73594541ba5ecf84680e516628f9f8a8,
         type: 3}
       propertyPath: MoveChange

Assets/Scripts/Blue/Controller/CloseAutoImmersal.cs

@@ -1,5 +1,8 @@
+using System.Collections;
+using System.IO;
 using Newtonsoft.Json;
 using UnityEngine;
+using UnityEngine.Networking;
 
 /// <summary>
 /// 指定用户关闭Immersal自动定位
@@ -7,13 +10,34 @@ using UnityEngine;
 /// </summary>
 public class CloseAutoImmersal : MonoBehaviour
 {
+    [SerializeField] private GameObject LocalizeBtn;
     void Start()
     {
-        TextAsset jsonTextAsset = Resources.Load("BlueUserConfig") as TextAsset;
-        BlueUserConfig BlueUserConfig = JsonConvert.DeserializeObject<BlueUserConfig>(jsonTextAsset.text);
-        if (BlueUserConfig.Auto)
+        StartCoroutine(ReadFromStreamingAssets());
+    }
+    IEnumerator ReadFromStreamingAssets()
+    {
+        var uri = new System.Uri(Path.Combine(Application.streamingAssetsPath, "BlueUserConfig.txt"));
+        UnityWebRequest request = UnityWebRequest.Get(uri);
+        yield return request.SendWebRequest();
+        if (request.result== UnityWebRequest.Result.Success)
         {
-            GameObject.Find("SetBtn/Canvas/Parent/LocalizeBtn").gameObject.SetActive(false);
+            byte[] data = request.downloadHandler.data;
+            string jsonString = System.Text.Encoding.UTF8.GetString(data);
+            Debug.Log("File content: " + jsonString);
+            BlueUserConfig BlueUserConfig = JsonConvert.DeserializeObject<BlueUserConfig>(jsonString);
+            if (BlueUserConfig.Auto)
+                LocalizeBtn.SetActive(false);
+            Debug.Log("BlueUserConfig:"+BlueUserConfig.Auto);
+            Debug.Log("LocalizeBtn:"+(LocalizeBtn==null));
+
+            AutoERNIEBot.Auto = BlueUserConfig.Auto;
+            AutoERNIEBot.ERNIEBot = BlueUserConfig.ERNIEBot;
         }
     }
 }
+public static class AutoERNIEBot
+{
+    public static bool Auto = false;
+    public static bool ERNIEBot = false;
+}

Assets/Scripts/Blue/Controller/ImmersalLocalControl.cs

@@ -2,7 +2,6 @@ using Immersal.AR;
 using UnityEngine;
 using Blue;
 using UnityEngine.UI;
-using Newtonsoft.Json;
 
 /// <summary>
 /// 打开景点后是否开启点云定位功能
@@ -19,20 +18,16 @@ public class ImmersalLocalControl : AbstractController
     public bool isOn; // 是否开启
 
     private bool firstOpen = true; // 第一次打开
-    private BlueUserConfig BlueUserConfig;
     private void Awake()
     {
-        TextAsset jsonTextAsset = Resources.Load("BlueUserConfig") as TextAsset;
-        BlueUserConfig = JsonConvert.DeserializeObject<BlueUserConfig>(jsonTextAsset.text);
-
-        if (!BlueUserConfig.Auto)
+        if (!AutoERNIEBot.Auto)
         {
             this.RegisterEvent<SetImmersalLocalEvent>(Unload);
         }
     }
     private void OnEnable()
     {
-        if(BlueUserConfig.Auto) return;
+        if(AutoERNIEBot.Auto) return;
 
         if(firstOpen)
         {
@@ -66,7 +61,7 @@ public class ImmersalLocalControl : AbstractController
     }
     private void OnDisable()
     {
-        if(BlueUserConfig.Auto) return;
+        if(AutoERNIEBot.Auto) return;
         this.UnRegisterEvent<SetImmersalLocalEvent>(Unload);
     }
 

Assets/Scripts/Blue/Controller/ImmersalLocalizerController.cs

@@ -20,9 +20,6 @@ public class ImmersalLocalizerController: AbstractController
 
     private void Awake()
     {
-        TextAsset jsonTextAsset = Resources.Load("BlueUserConfig") as TextAsset;
-        BlueUserConfig BlueUserConfig = JsonConvert.DeserializeObject<BlueUserConfig>(jsonTextAsset.text);
-
         this.RegisterEvent<StartImmersalLocalizerEvent>(e =>
         {
             XRLocalizer.enabled = true;
@@ -30,7 +27,7 @@ public class ImmersalLocalizerController: AbstractController
 
         this.RegisterEvent<SuccessImmersalLocalizerEvent>(e =>
         {
-            if (!BlueUserConfig.Auto)
+            if (!AutoERNIEBot.Auto)
             {
                 Y_Location_Toggle.transform.Find("Background").GetComponent<Image>().color = white;
                 Y_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = white;
@@ -38,11 +35,12 @@ public class ImmersalLocalizerController: AbstractController
                 N_Location_Toggle.transform.Find("Background/Checkmark").GetComponent<Image>().color = blue;
 
                 StartCoroutine(XRLocalizerActive());
-            }
-            InstantiateCommand Command = new InstantiateCommand(
+
+                InstantiateCommand Command = new InstantiateCommand(
                         InstantiateSystem.Instance.BlueObject.NormalPopUp,
                         "定位成功");
-            this.SendCommand(Command);
+                this.SendCommand(Command);
+            }
         }).UnRegisterWhenGameObjectDestroyed(gameObject);
     }
 

Assets/Scripts/Blue/Controller/IsLocation.cs

@@ -1,10 +1,7 @@
-using System.Collections;
-using System.Collections.Generic;
 using Immersal.AR;
 using Blue;
 using UnityEngine.UI;
 using UnityEngine;
-using Newtonsoft.Json;
 
 /// <summary>
 /// 是否定位功能
@@ -20,10 +17,7 @@ public class IsLocation : AbstractController
     private Color32 white= new Color32(255, 255, 255, 255);
     private void Start()
     {
-        TextAsset jsonTextAsset = Resources.Load("BlueUserConfig") as TextAsset;
-        BlueUserConfig BlueUserConfig = JsonConvert.DeserializeObject<BlueUserConfig>(jsonTextAsset.text);
-
-        if (!BlueUserConfig.Auto)
+        if (!AutoERNIEBot.Auto)
         {
             Y_Location_Toggle.onValueChanged.AddListener(Y_IsLocationValueChange);
             N_Location_Toggle.onValueChanged.AddListener(N_IsLocationValueChange);

Assets/Scripts/Blue/Editor/EditorUser.cs

@@ -85,8 +85,8 @@ public static class EditorUser
 
     private static void WriteUserListConfig(string UserName)
     {
-        string folderPath = Application.dataPath + "/Resources";
-        string filePath = Application.dataPath + "/Resources" + "/BlueUserListConfig.txt";
+        string folderPath = Application.dataPath + "/StreamingAssets";
+        string filePath = Application.dataPath + "/StreamingAssets" + "/BlueUserListConfig.txt";
 
         if (!Directory.Exists(folderPath))
             Directory.CreateDirectory(folderPath);
@@ -111,10 +111,10 @@ public static class EditorUser
     private static BlueUserConfig mBlueUserConfig;
     private static void WriteUserConfig(BlueUserType blueUserType)
     {
-        string filePath = Application.dataPath + "/Resources" + "/BlueUserConfig.txt";
-
-        TextAsset jsonTextAsset = Resources.Load("BlueUserListConfig") as TextAsset;
-        List<BlueUserConfig> BlueUserListConfig = JsonConvert.DeserializeObject<List<BlueUserConfig>>(jsonTextAsset.text);
+        string filePath = Application.dataPath + "/StreamingAssets" + "/BlueUserConfig.txt";
+        string filePathList = Application.dataPath + "/StreamingAssets" + "/BlueUserListConfig.txt";
+        string jsonString = File.ReadAllText(filePathList);
+        List<BlueUserConfig> BlueUserListConfig = JsonConvert.DeserializeObject<List<BlueUserConfig>>(jsonString);
         foreach(var BlueUserConfig in BlueUserListConfig)
         {
             if(BlueUserConfig.BlueUserType==blueUserType.ToString())

Assets/Scripts/UI/GameManager.cs

@@ -334,9 +334,7 @@ public class GameManager : MonoSingleton<GameManager>
         InitCrystals();
         InitBoxColliders();
 
-        TextAsset jsonTextAsset = Resources.Load("BlueUserConfig") as TextAsset;
-        BlueUserConfig BlueUserConfig = JsonConvert.DeserializeObject<BlueUserConfig>(jsonTextAsset.text);
-        if (BlueUserConfig.ERNIEBot)
+        if (AutoERNIEBot.ERNIEBot)
             ERNIEBot.SetActive(true);
 
         CommandSystem.Instance.Send(new LoadMapFileCommand());

Assets/Resources/BlueUserConfig.txt.meta → Assets/StreamingAssets/BlueUserConfig.txt.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 53d83c6c9d9bbcc409ae37f3789a0a3e
-TextScriptImporter:
+guid: 6943c64369299fb4d806aca83871b2e7
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

Assets/Resources/BlueUserListConfig.txt → Assets/StreamingAssets/BlueUserListConfig.txt

@@ -1 +1 @@
-[{"BlueUserType":"Blue","Auto":false,"ERNIEBot":false},{"BlueUserType":"WenChuang","Auto":false,"ERNIEBot":true},{"BlueUserType":"NingYuan","Auto":false,"ERNIEBot":false},{"BlueUserType":"YangPuDangJian","Auto":true,"ERNIEBot":false}]
+[{"BlueUserType":"Blue","Auto":false,"ERNIEBot":false},{"BlueUserType":"WenChuang","Auto":false,"ERNIEBot":true},{"BlueUserType":"NingYuan","Auto":false,"ERNIEBot":false},{"BlueUserType":"YangPuDangJian","Auto":false,"ERNIEBot":false}]

Assets/Resources/BlueUserListConfig.txt.meta → Assets/StreamingAssets/BlueUserListConfig.txt.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 030c10fd833603544988cad6ac5dc05d
-TextScriptImporter:
+guid: b8e0b76a2666fb842ae8fc228629916b
+DefaultImporter:
   externalObjects: {}
   userData: 
   assetBundleName: