修复无法保存 报错 以及65圆盘无法识别等问题

Assets/Prefab/Route/Materials/LineMat_1_High.mat

@@ -46,7 +46,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 0f32cd85f823fe84abe068e17c59e180, type: 3}
         m_Scale: {x: 1, y: 3}
-        m_Offset: {x: 0, y: -72.74984}
+        m_Offset: {x: 0, y: -4.6499996}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

Assets/Prefab/Route/Materials/LineMat_2.mat

@@ -46,7 +46,7 @@ Material:
     - _MainTex:
         m_Texture: {fileID: 2800000, guid: 8d2978ebe0e61344e84ac48fa5d7426c, type: 3}
         m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: -10.450022}
+        m_Offset: {x: 0, y: -12.250029}
     - _MetallicGlossMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}

Assets/Scenes/LangChaoDemo2.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657826, g: 0.49641263, b: 0.57481676, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -2025,7 +2025,7 @@ Transform:
   m_Children:
   - {fileID: 2085389668}
   m_Father: {fileID: 0}
-  m_RootOrder: 46
+  m_RootOrder: 47
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &122690070
 GameObject:
@@ -4002,7 +4002,7 @@ Transform:
   m_Children:
   - {fileID: 1428694659}
   m_Father: {fileID: 0}
-  m_RootOrder: 37
+  m_RootOrder: 38
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &307533891
 GameObject:
@@ -4475,6 +4475,256 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4944353772951783779, guid: 7cd0ceba7525bdc42a36be841a8aad16, type: 3}
   m_PrefabInstance: {fileID: 332018100}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &334138221
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 334138222}
+  - component: {fileID: 334138228}
+  - component: {fileID: 334138227}
+  - component: {fileID: 334138226}
+  - component: {fileID: 334138225}
+  - component: {fileID: 334138224}
+  - component: {fileID: 334138223}
+  m_Layer: 0
+  m_Name: EditorTag (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &334138222
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 334138221}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 480063035}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &334138223
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 334138221}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: be58c34b8ef83b74f910a09e87998528, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  name: 
+  id: 0
+--- !u!114 &334138224
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 334138221}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0dbccc4d71ae5b447bab3997600fbdce, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PointerEnter:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDown:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: PointerDown
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 334138222}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Transform, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  PointerClick:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerUp:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: PointerUp
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 334138222}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Transform, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  PointerExit:
+    m_PersistentCalls:
+      m_Calls: []
+  PointerDrag:
+    m_PersistentCalls:
+      m_Calls: []
+  Target: {fileID: 0}
+  StartAudio: 6
+  EndAudio: 5
+  headRotate: 0
+  oneGameControllerRotate: 0
+  canOneHandRotate: 0
+  canTwoHandRotate: 0
+  canTwoHandScale: 0
+  minScaleRatio: 0.8
+  maxScaleRatio: 3
+  isParentDrag: 0
+--- !u!114 &334138225
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 334138221}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 761d3c9fbe9f13f47818f9c59cd6aa03, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  activation: 1
+  flattenAxis: 0
+  activeHandle: 3
+  m_HandlerAssets: {fileID: 0}
+  activeScaleMinRestrict: 1
+  scaleMinimum: 0.05
+  activeScaleMaxRestrict: 0
+  scaleMaximum: 2
+  BoundBoxCollider: {fileID: 0}
+  showRotationHandleForX: 1
+  showRotationHandleForY: 1
+  showRotationHandleForZ: 1
+  activeAxis: -2
+  RotateStartAudio: 4
+  RotateStopAudio: 3
+  ScaleStartAudio: 4
+  ScaleStopAudio: 3
+  RotateStarted:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: PointerDown
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 334138222}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Transform, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  RotateStopped:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: PointerUp
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 334138222}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Transform, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  ScaleStarted:
+    m_PersistentCalls:
+      m_Calls: []
+  ScaleStopped:
+    m_PersistentCalls:
+      m_Calls: []
+  Rotating:
+    m_PersistentCalls:
+      m_Calls: []
+  Scaling:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!65 &334138226
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 334138221}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &334138227
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 334138221}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: a14e731e204948448a91cecee4414e04, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &334138228
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 334138221}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &334863032
 GameObject:
   m_ObjectHideFlags: 0
@@ -5958,6 +6208,128 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 469901233}
   m_CullTransparentMesh: 1
+--- !u!1 &480063032
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 480063035}
+  - component: {fileID: 480063034}
+  - component: {fileID: 480063033}
+  m_Layer: 0
+  m_Name: SceneTag (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &480063033
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 480063032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cc6e4aa17433fcd4c904723893c06b3d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  onFirstTrackingEvent:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: OnTrackingFirst
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 480063034}
+          m_ObjectArgumentAssemblyTypeName: Ximmerse.XR.Tag.TagTracking, Ximmerse.XR
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  onTrackingEnter:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: OnTrackingFound
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 480063034}
+          m_ObjectArgumentAssemblyTypeName: Ximmerse.XR.Tag.TagTracking, Ximmerse.XR
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  onTrackingStay:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: OnTrackingStay
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 480063034}
+          m_ObjectArgumentAssemblyTypeName: Ximmerse.XR.Tag.TagTracking, Ximmerse.XR
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+  onTrackingExit:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 1012225064}
+        m_TargetAssemblyTypeName: MachineRoomManager, Assembly-CSharp
+        m_MethodName: OnTrackingLost
+        m_Mode: 2
+        m_Arguments:
+          m_ObjectArgument: {fileID: 480063034}
+          m_ObjectArgumentAssemblyTypeName: Ximmerse.XR.Tag.TagTracking, Ximmerse.XR
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &480063034
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 480063032}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 062fe91f7f40e2842b56a188ab73f67d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  trackID: 65
+  trackingIsLost: 0
+  m_debugView: 1
+  m_size: 0.17
+--- !u!4 &480063035
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 480063032}
+  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:
+  - {fileID: 334138222}
+  m_Father: {fileID: 0}
+  m_RootOrder: 36
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &482153408
 GameObject:
   m_ObjectHideFlags: 0
@@ -10238,7 +10610,7 @@ Transform:
   m_Children:
   - {fileID: 1301454615}
   m_Father: {fileID: 0}
-  m_RootOrder: 41
+  m_RootOrder: 42
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &791758554
 GameObject:
@@ -11404,7 +11776,7 @@ Transform:
   m_Children:
   - {fileID: 1455474013}
   m_Father: {fileID: 0}
-  m_RootOrder: 47
+  m_RootOrder: 48
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &874439297
 GameObject:
@@ -13884,7 +14256,7 @@ Transform:
   m_Children:
   - {fileID: 1007470594}
   m_Father: {fileID: 0}
-  m_RootOrder: 44
+  m_RootOrder: 45
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1007470593
 GameObject:
@@ -14074,9 +14446,7 @@ MonoBehaviour:
   bladeServer: {fileID: 1111232644}
   isInit: 0
   listEditorTag:
-  - {fileID: 0}
-  - {fileID: 0}
-  - {fileID: 0}
+  - {fileID: 334138223}
   - {fileID: 503826678}
   - {fileID: 1764105086}
   foundTracking: {fileID: 1424554103}
@@ -14399,7 +14769,7 @@ Transform:
   m_Children:
   - {fileID: 1195914728}
   m_Father: {fileID: 0}
-  m_RootOrder: 42
+  m_RootOrder: 43
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1038271688
 GameObject:
@@ -18002,7 +18372,7 @@ Transform:
   m_Children:
   - {fileID: 1674454061}
   m_Father: {fileID: 0}
-  m_RootOrder: 38
+  m_RootOrder: 39
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1341529265
 GameObject:
@@ -18474,7 +18844,7 @@ Transform:
   m_Children:
   - {fileID: 1767066921}
   m_Father: {fileID: 0}
-  m_RootOrder: 36
+  m_RootOrder: 37
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1353351977
 MonoBehaviour:
@@ -19409,7 +19779,7 @@ Transform:
   m_Children:
   - {fileID: 513072084}
   m_Father: {fileID: 0}
-  m_RootOrder: 43
+  m_RootOrder: 44
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1416708796
 GameObject:
@@ -19507,7 +19877,7 @@ Transform:
   m_Children:
   - {fileID: 337898556}
   m_Father: {fileID: 0}
-  m_RootOrder: 45
+  m_RootOrder: 46
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1417717206
 GameObject:
@@ -22755,7 +23125,7 @@ Transform:
   m_Children:
   - {fileID: 66988797}
   m_Father: {fileID: 0}
-  m_RootOrder: 39
+  m_RootOrder: 40
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1713568285
 GameObject:
@@ -25016,7 +25386,7 @@ Transform:
   m_Children:
   - {fileID: 634173867}
   m_Father: {fileID: 0}
-  m_RootOrder: 40
+  m_RootOrder: 41
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1909598945
 GameObject:

Assets/Scripts/MQTT/MQTTClient.cs

@@ -149,7 +149,7 @@ public class MQTTClient : MonoSingleton<MQTTClient>
             rid = front+UserInfo.Instance.name + "_Phone";
         }
         DisConnect();
-        qt = new QTTManager(front+id, username, password, HttpAction.Instance.mqtturl, HttpAction.Instance.officeport);
+        qt = new QTTManager(front+id, username, password, HttpAction.Instance.officeSocket, "1883");
         qt.Connect();
         StartCoroutine(Reconnection());
         qt.ConnectionFailed += onFaild;

Assets/Scripts/Managers/MachineRoomManager.cs

@@ -110,7 +110,7 @@ public class MachineRoomManager : MonoSingleton<MachineRoomManager>
         //listTagid.Add(4361);
         //listTagid.Add(4364);
 
-          PlayerPrefs.DeleteAll();
+          //PlayerPrefs.DeleteAll();
         if (PlayerPrefs.HasKey("MachineRoomData"))
         {
             string msg = PlayerPrefs.GetString("MachineRoomData");

Assets/XR/XRGeneralSettings.asset

@@ -45,4 +45,4 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-  - {fileID: 11400000, guid: 3eac61c9e150ed240b871860c5422332, type: 2}
+  - {fileID: 11400000, guid: ea6b4fa5606b423479ad49b5a843cefe, type: 2}