Browse Source

删除场景内水族馆和OBE冲突的相关代码

DGJ 1 year ago
parent
commit
5d900360cb

+ 190 - 310
Assets/MRNavigatorPro.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 705507994}
-  m_IndirectSpecularColor: {r: 0.44402242, g: 0.49316543, b: 0.5722324, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1116,7 +1116,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 375338274}
-  m_Mesh: {fileID: 1384436784}
+  m_Mesh: {fileID: 1743177091}
 --- !u!114 &375338278
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1549,6 +1549,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 06ff28a23a97e50428b6a6b63f3d0814, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  netSpeedStr: 
 --- !u!114 &561349959
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1614,7 +1615,6 @@ MonoBehaviour:
   - {fileID: 156672773}
   - {fileID: 156672773}
   - {fileID: 156672773}
-  - {fileID: 1783143723}
   isShowLoacalShowObjs: 0
   ListColliderBoxs: []
   ListCrystals: []
@@ -1647,7 +1647,7 @@ MonoBehaviour:
   isPlayMRZhanTing: 0
   m_IroBot: {fileID: 1911990708955312460}
   Player: {fileID: 1852879476}
-  m_head: {fileID: 1671128857}
+  m_head: {fileID: 0}
   Irobots:
   - {fileID: 1911990708955312460}
   - {fileID: 1911990708955312460}
@@ -3489,170 +3489,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 868561201}
   m_PrefabAsset: {fileID: 0}
---- !u!43 &1384436784
-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!1001 &1384597414
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -4059,7 +3895,7 @@ PrefabInstance:
     - target: {fileID: 2656584712679981451, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.002449287
+      value: -0.00041814763
       objectReference: {fileID: 0}
     - target: {fileID: 2656584712838976906, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -4189,37 +4025,37 @@ PrefabInstance:
     - target: {fileID: 2656584713474595953, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.00013810121
+      value: -0.006655126
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584713571100915, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -101.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714058937656, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
@@ -4229,62 +4065,62 @@ PrefabInstance:
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2656584714091092633, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -35.5
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 188
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_SizeDelta.y
-      value: 61
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 100
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 3618627243639674965, guid: 3e8996c442fe40541beb734ca45f2bf6,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -35.5
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3e8996c442fe40541beb734ca45f2bf6, type: 3}
@@ -4607,12 +4443,6 @@ Transform:
   m_Father: {fileID: 210725851}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &1671128857 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4181028404793140004, guid: 7cd0ceba7525bdc42a36be841a8aad16,
-    type: 3}
-  m_PrefabInstance: {fileID: 1997991780}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1709118220 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 1269803834018763930, guid: c2949074f3b713b4abec308e62ad895b,
@@ -4656,6 +4486,170 @@ RectTransform:
     type: 3}
   m_PrefabInstance: {fileID: 5055851586598796918}
   m_PrefabAsset: {fileID: 0}
+--- !u!43 &1743177091
+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!4 &1743740842 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 38319362, guid: aca09677629b3fe4f96c3fb720d34f82,
@@ -4813,9 +4807,6 @@ MonoBehaviour:
   windowAnchor: 4
   windowOffset: {x: 0, y: 0}
   defaultWindowRotation: {x: 0, y: 0}
-  InstantFollowing: 0
-  LinearFollowing: 0
-  menu_size: {x: 0, y: 0}
 --- !u!114 &1775082050
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4922,116 +4913,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1778699410}
   m_CullTransparentMesh: 0
---- !u!1001 &1783143722
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 1873793055}
-    m_Modifications:
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_RootOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 4.91
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -4.2
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.7071068
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 90
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364918, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_Name
-      value: ShuiZuGuan 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 2124455586331364918, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2679647526223144678, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4776071256245510026, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5583342532605317708, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5838846733818255874, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: player
-      value: 
-      objectReference: {fileID: 1852879475}
-    - target: {fileID: 5838846734324275880, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: player
-      value: 
-      objectReference: {fileID: 1852879475}
-    - target: {fileID: 5838846734457721812, guid: f627f6b5dc74ebb4696732eccec7db1a,
-        type: 3}
-      propertyPath: player
-      value: 
-      objectReference: {fileID: 1852879475}
-    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: f627f6b5dc74ebb4696732eccec7db1a, type: 3}
---- !u!4 &1783143723 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2124455586331364913, guid: f627f6b5dc74ebb4696732eccec7db1a,
-    type: 3}
-  m_PrefabInstance: {fileID: 1783143722}
-  m_PrefabAsset: {fileID: 0}
 --- !u!850595691 &1800010878
 LightingSettings:
   m_ObjectHideFlags: 0
@@ -5495,7 +5376,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 156672773}
-  - {fileID: 1783143723}
   m_Father: {fileID: 210725851}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6623,7 +6503,7 @@ PrefabInstance:
     - target: {fileID: 486518953982833418, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -0.0019784954
+      value: 0.0036432494
       objectReference: {fileID: 0}
     - target: {fileID: 486518953989235048, guid: 6693e68f506a6c944b1783fb7e52a498,
         type: 3}
@@ -10438,7 +10318,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.006363411}
+  m_AnchoredPosition: {x: 0, y: -0.00042535982}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &1180406930876628118

+ 0 - 550
Assets/Script/AudioManager.cs

@@ -1,550 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using UnityEngine.SceneManagement;
-using System.Runtime.CompilerServices;
-
-/// <summary>
-/// 音频管理类
-/// </summary>
-public class AudioManager : MonoSingleton<AudioManager>
-{
-    // private static AudioManager _instance;
-    //public static AudioManager Instance;
-    //{
-
-    //    get
-    //    {
-
-    //        //if (_instance == null)
-    //        //{
-    //        //    string name = "SoundManager";
-    //        //    GameObject manager = GameObject.Find("SoundManager");
-    //        //    if (manager == null)
-    //        //    {
-    //        //        manager = new GameObject(name);
-    //        //        _instance = manager.AddComponent<AudioManager>();
-    //        //    }
-    //        //    else
-    //        //    {
-    //        //        _instance = manager.GetComponent<AudioManager>();
-    //        //        if (_instance == null)
-    //        //        {
-    //        //            _instance = manager.AddComponent<AudioManager>();
-    //        //        }
-    //        //    }
-    //        //}
-
-    //        return _instance;
-    //    }
-    //}
-
-    private AudioSource audioSound;     //音效播放器
-    private AudioSource audioMusic;     //背景音乐播放
-    private AudioSource audioLanguage;  //配音播放器
-    public AudioClip[] sceses_BJList;    //主背景音效
-    public AudioClip[] sceses_SanGuoList;//三国场景音效
-
-    public AudioClip[] scences_Aquarium;//海洋馆音效
-    public AudioClip[] sceses_GongYeList_OBE;//工业obe场景音效
-    public AudioClip[] sceses_GongYeList_GKJ;//工业光刻机场景音效
-    public AudioClip[] sceses_GongYeList_DT;//工业地铁内抛图场景音效
-    public AudioClip[] sceses_YiLiaoList;//医疗场景音效
-    public AudioClip[] sceses_WeiLaiChengShiList;//未来城市
-    public AudioClip[] sceses_XiaoFangAnQuanList;//消防安全音效
-    public AudioClip[] sceses_JiaoYuList;//化学教育音效
-    public AudioClip[] sceses_BoWuGunList;//博物馆音效
-    public AudioClip[] sceses_PartyBuildingList;//党建音效
-
-
-    public float bjSoundVolume;
-
-
-
-    /// <summary>
-    /// 背景音效
-    /// </summary>
-    /// <param name="str"></param>
-    public void PlayBJSounds(string str)
-    {
-        Debug.Log(str);
-
-        switch (str)
-        {
-
-            case "bjSound_SanGuo":
-                PlayMusic((AudioClip)sceses_BJList[0], true);
-                break;
-            case "bjSound2_GongYe":
-                PlayMusic((AudioClip)sceses_BJList[1], true);
-                break;
-            case "bjSound3_RenTi":
-                PlayMusic((AudioClip)sceses_BJList[2], true);
-                break;
-            case "bjSound4_JiaoYu":
-                PlayMusic((AudioClip)sceses_BJList[3], true);
-                break;
-            case "bjSound5_WeiLaiChengShi":
-                PlayMusic((AudioClip)sceses_BJList[4], true);
-                break;
-            case "bjSound6_FireSafe":
-                PlayMusic((AudioClip)sceses_BJList[5], true);
-                break;
-            case "bjSound5_BoWuGuan":
-                PlayMusic((AudioClip)sceses_BJList[6], true);
-                break;
-            case "bjSound5_PartyBuilding":
-                PlayMusic((AudioClip)sceses_BJList[7], true);
-                break;
-            case "None":
-                PlayMusic((AudioClip)sceses_BJList[8], false);
-                break;
-
-
-
-        }
-    }
-    /// <summary>
-    /// 三国场景音效
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioSanGuo_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-            case "SG_HLG"://虎牢关 三英战吕布
-                PlayLanguage(sceses_SanGuoList[0]);
-                break;
-            case "SG_TYSJY"://桃园三结义
-                PlayLanguage(sceses_SanGuoList[1]);
-                break;
-            case "SG_HSCB"://火烧赤壁
-                PlayLanguage(sceses_SanGuoList[2]);
-                break;
-            case "SG_YMSJ"://辕门射戟
-                PlayLanguage(sceses_SanGuoList[3]);
-                break;
-
-        }
-    }
-    /// <summary>
-    /// OBE
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioGongYe_OBE_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-            case "GY_OBE_SoundStart":
-                PlayLanguage(sceses_GongYeList_OBE[0]);
-                break;
-            case "GY_OBE_Sound1":
-                PlayLanguage(sceses_GongYeList_OBE[1]);
-                break;
-            case "GY_OBE_Sound2":
-                PlayLanguage(sceses_GongYeList_OBE[2]);
-                break;
-            case "GY_OBE_Sound3":
-                PlayLanguage(sceses_GongYeList_OBE[3]);
-                break;
-            case "GY_OBE_Sound4":
-                PlayLanguage(sceses_GongYeList_OBE[4]);
-                break;
-            case "GY_OBE_Sound5":
-                PlayLanguage(sceses_GongYeList_OBE[5]);
-                break;
-            case "GY_OBE_SoundEnd":
-                PlayLanguage(sceses_GongYeList_OBE[6]);
-                break;
-        }
-    }
-    /// <summary>
-    /// 光刻机
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioGongYe_GKJ_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-
-            case "GY_GKJ1":
-                PlayLanguage(sceses_GongYeList_GKJ[0]);
-                break;
-            case "GY_GKJ2":
-                PlayLanguage(sceses_GongYeList_GKJ[1]);
-                break;
-            case "GY_GKJ3":
-                PlayLanguage(sceses_GongYeList_GKJ[2]);
-                break;
-            case "GY_GKJ4":
-                PlayLanguage(sceses_GongYeList_GKJ[3]);
-                break;
-            case "GY_GKJ5":
-                PlayLanguage(sceses_GongYeList_GKJ[4]);
-                break;
-            case "GY_GKJ6":
-                PlayLanguage(sceses_GongYeList_GKJ[5]);
-                break;
-            case "GY_GKJ_Start":
-                PlayLanguage(sceses_GongYeList_GKJ[6]);
-                break;
-
-        }
-    }
-    /// <summary>
-    /// 地铁内视图
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioGongYe_DT_LanguageSounds(string str)
-    {
-
-        Debug.Log("str");
-        switch (str)
-        {
-            case "GY_dianliqianyin"://电力牵引机
-                PlayLanguage(sceses_GongYeList_DT[0]);
-                break;
-            case "GY_guagqian"://光纤交换机
-                PlayLanguage(sceses_GongYeList_DT[1]);
-                break;
-            case "GY_luyouqi"://路由器
-                PlayLanguage(sceses_GongYeList_DT[2]);
-                break;
-            case "GY_yitaiwang"://以太网交换机
-                PlayLanguage(sceses_GongYeList_DT[3]);
-                break;
-            case "GY_jiankong"://.监控系统
-                PlayLanguage(sceses_GongYeList_DT[4]);
-                break;
-            case "GY_zhuanhuanqi"://转换器
-                PlayLanguage(sceses_GongYeList_DT[5]);
-                break;
-            case "GY_dianji"://电机
-                PlayLanguage(sceses_GongYeList_DT[6]);
-                break;
-            case "GY_kongtiao"://空调通风系统
-                PlayLanguage(sceses_GongYeList_DT[7]);
-                break;
-            case "GY_DT"://空调通风系统
-                PlayLanguage(sceses_GongYeList_DT[8]);
-                break;
-
-        }
-    }
-
-
-
-    /// <summary>
-    ///医疗音效
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioYiLiao_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-            case "YL_Start":
-                PlayLanguage(sceses_YiLiaoList[0]);
-                break;
-        }
-    }
-
-    /// <summary>
-    ///未来城市
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioWLCS_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-            case "WLCS_Start":
-                PlayLanguage(sceses_WeiLaiChengShiList[0]);
-                break;
-        }
-    }
-    /// <summary>
-    /// 消防安全
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioHZ_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-            case "XFAQ_Start":
-                PlayLanguage(sceses_XiaoFangAnQuanList[0]);
-                break;
-        }
-    }
-
-    /// <summary>
-    /// 化学教育音效
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioJiaoYu_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-            case "HX_SoundStart":
-                PlayLanguage(sceses_JiaoYuList[0]);
-                break;
-            case "HX_1":
-                PlayLanguage(sceses_JiaoYuList[1]);
-                break;
-            case "HX_2":
-                PlayLanguage(sceses_JiaoYuList[2]);
-                break;
-            case "HX_3":
-                PlayLanguage(sceses_JiaoYuList[3]);
-                break;
-            case "HX_4":
-                PlayLanguage(sceses_JiaoYuList[4]);
-                break;
-            case "HX_5":
-                PlayLanguage(sceses_JiaoYuList[5]);
-                break;
-            case "HX_6":
-                PlayLanguage(sceses_JiaoYuList[6]);
-                break;
-        }
-    }
-    /// <summary>
-    /// 博物馆音效
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioBoWuGun_LanguageSounds(string str)
-    {
-        Debug.Log(str);
-        switch (str)
-        {
-
-            case "matafeiyan":
-                PlayLanguage(sceses_BoWuGunList[0]);
-                break;
-            case "yuwanggoujianjian":
-                PlayLanguage(sceses_BoWuGunList[1]);
-                break;
-            case "tangsancai":
-                PlayLanguage(sceses_BoWuGunList[2]);
-                break;
-            case "qinghuaci":
-                PlayLanguage(sceses_BoWuGunList[3]);
-                break;
-            case "BWG_end":
-                PlayLanguage(sceses_BoWuGunList[4]);
-                break;
-        }
-    }
-
-    /// <summary>
-    /// 党建音乐
-    /// </summary>
-    /// <param name="str"></param>
-    public void AudioPartyBuilding_LanguageSounds(string str)
-    {
-        switch (str)
-        {
-            case "PartyBuilding_zgcl"://中共成立
-                PlayLanguage((AudioClip)sceses_PartyBuildingList[0]);
-                break;
-            case "PartyBuilding_gxscd"://过雪山草地
-                PlayLanguage((AudioClip)sceses_PartyBuildingList[1]);
-                break;
-            case "PartyBuilding_zxzd"://政协制度
-                PlayLanguage((AudioClip)sceses_PartyBuildingList[2]);
-                break;
-            case "PartyBuilding_ggkf"://改革开放
-                PlayLanguage((AudioClip)sceses_PartyBuildingList[3]);
-                break;
-            case "PartyBuilding_kgdd"://开国大典
-                PlayLanguage((AudioClip)sceses_PartyBuildingList[4]);
-                break;
-        }
-    }
-
-
-    /// <summary>
-    /// 是否播放背景音乐
-    /// </summary>
-    public bool IsPlayMusic
-    {
-        get { return !audioMusic.mute; }
-        set
-        {
-            audioMusic.mute = !value;
-            PlayerPrefs.SetInt("isMusicOpen", value ? 1 : 0);
-        }
-    }
-
-    /// <summary>
-    /// 是否播放音效
-    /// </summary>
-    public bool IsPlaySound
-    {
-        get { return !audioSound.mute; }
-        set
-        {
-            audioSound.mute = !value;
-            PlayerPrefs.SetInt("isSoundOpen", value ? 1 : 0);
-        }
-    }
-
-    /// <summary>
-    /// 是否播放配音
-    /// </summary>
-    public bool IsPlayLanguage
-    {
-        get { return !audioLanguage.mute; }
-        set
-        {
-            audioLanguage.mute = !value;
-            PlayerPrefs.SetInt("isLanguageOpen", value ? 1 : 0);
-        }
-    }
-
-    /// <summary>
-    /// 背景音乐大小,调节大小
-    /// </summary>
-    public float MusicVolume
-    {
-        get { return audioMusic.volume; }
-        set
-        {
-            audioMusic.volume = value;
-            PlayerPrefs.SetFloat("MusicVolume", Mathf.Clamp(value, 0f, 1f));
-        }
-    }
-
-    /// <summary>
-    /// 。调节大小
-    /// </summary>
-    public float SoundVolume
-    {
-        get { return audioSound.volume; }
-        set
-        {
-            audioSound.volume = value;
-            PlayerPrefs.SetFloat("SoundVolume", Mathf.Clamp(value, 0f, 1f));
-        }
-    }
-    /// <summary>
-    /// 音效大小
-    /// </summary>
-    public float LanguageVolume
-    {
-        get { return audioLanguage.volume; }
-        set
-        {
-            audioLanguage.volume = value;
-            PlayerPrefs.SetFloat("LanguageVolume", Mathf.Clamp(value, 0f, 1f));
-        }
-    }
-
-
-    void Awake()
-    {
-        //  DontDestroyOnLoad(this.gameObject);
-        //Instance = this;
-        //sceses_BJList = Resources.LoadAll("Sounds/BJSounds");//自动加载文件夹下的声音
-
-
-        audioSound = gameObject.AddComponent<AudioSource>();
-        audioMusic = gameObject.AddComponent<AudioSource>();
-        audioLanguage = gameObject.AddComponent<AudioSource>();
-
-        audioMusic.loop = true;
-        audioMusic.playOnAwake = false;
-
-
-
-        MusicVolume = bjSoundVolume;
-
-        this.IsPlayMusic = (PlayerPrefs.GetInt("isMusicOpen", 1) > 0);
-        this.IsPlaySound = (PlayerPrefs.GetInt("isSoundOpen", 1) > 0);
-        this.IsPlayLanguage = (PlayerPrefs.GetInt("isLanguageOpen", 1) > 0);
-
-        this.MusicVolume = PlayerPrefs.GetFloat("MusicVolume", bjSoundVolume);
-        this.SoundVolume = PlayerPrefs.GetFloat("SoundVolume", 1f);
-        this.LanguageVolume = PlayerPrefs.GetFloat("LanguageVolume", 1f);
-    }
-
-    private void Start()
-    {
-        // StartCoroutine(MusicPlay());
-    }
-
-    IEnumerator MusicPlay()
-    {
-        yield return new WaitForSeconds(0.1f);
-        audioMusic.volume = 0.2f;//背景初始音效为0.2f
-    }
-    /// <summary>
-    /// 播放背景音乐
-    /// </summary>
-    public void PlayMusic(AudioClip clip, bool isLoop)
-    {
-        audioMusic.clip = null;
-        audioLanguage.clip = null;
-        if (clip == null)
-        {
-
-            return;
-        }
-
-        if (isLoop == false)
-        {
-            audioMusic.loop = false;
-            audioMusic.clip = clip;
-            audioMusic.Play();
-        }
-        else
-        {
-            audioMusic.loop = true;
-            audioMusic.clip = clip;
-            audioMusic.Play();
-        }
-
-        //if (audioMusic.isPlaying && clip.name == audioMusic.clip.name)
-        //{
-        //    return;
-        //}
-
-    }
-
-    /// <summary>
-    /// 停止播放音乐
-    /// </summary>
-    public void StopMusic()
-    {
-        audioMusic.clip = null;
-        audioMusic.Stop();
-        audioLanguage.clip = null;
-        audioLanguage.Stop();
-        audioSound.clip = null;
-        audioSound.Stop();
-    }
-
-    /// <summary>
-    /// 播放音效
-    /// </summary>
-    public void PlaySound(AudioClip clip)
-    {
-        if (clip == null)
-        {
-            return;
-        }
-        audioSound.PlayOneShot(clip);
-    }
-
-    /// <summary>
-    /// 播放配音
-    /// </summary>
-    public void PlayLanguage(AudioClip clip)
-    {
-        audioLanguage.clip = null;
-        if (clip == null)
-        {
-            return;
-        }
-        audioLanguage.clip = clip;
-        audioLanguage.Play();
-        // audioLanguage.PlayOneShot(clip);
-    }
-}

+ 0 - 11
Assets/Script/AudioManager.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 6f21857511e5f3e4d9eaca31ac00483f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Assets/Script/Entity.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 8c50dccdd886aeb4394266003eb40f4d
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 8
Assets/Script/Entity/ContentInfo.cs

@@ -1,8 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-[System.Serializable]
-public class ContentInfo 
-{
-    public string content;
-}

+ 0 - 11
Assets/Script/Entity/ContentInfo.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 619b714307773c5409fae723fc1ffded
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 19
Assets/Script/Entity/FunctionInfo.cs

@@ -1,19 +0,0 @@
-using CCS.App;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-[System.Serializable]
-public class FunctionInfo 
-{
-    public uint moduleID;
-    public uint functionID;// 唯一的id
-    public FunctionButtonType functionBtnType;// button 类型 只有开始/开始、关闭/或其他
-    public string functionName;//显示name
-    public int defaultValue;// 默认值
-    public bool isOpen;// 此功能是否在中控中开放
-    //public int functionValue;// 当前值
-    public List<FunctionValue> functionValues;
-    public FunctionType functionType;//功能类型
-    public int rangeValueMin=0;// 起始值
-    public int rangeValueMax=1;// 最大值
-}

+ 0 - 11
Assets/Script/Entity/FunctionInfo.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 0dd8d5516d77c424a85b3e2ac961fccf
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 10
Assets/Script/Entity/FunctionValue.cs

@@ -1,10 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-[System.Serializable]
-public class FunctionValue 
-{
-    public int index;
-    public int value;
-    public bool isShow;
-}

+ 0 - 11
Assets/Script/Entity/FunctionValue.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 118401bd2d2740542802e0c11d34b9e1
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 9
Assets/Script/Entity/ModuleFunctionData.cs

@@ -1,9 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-public class ModuleFunctionData 
-{
-    public List<ModuleInfo> modules;
-    public List<StepContentInfo> stepContentInfos;
-}

+ 0 - 11
Assets/Script/Entity/ModuleFunctionData.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4d2767160e4a10348862eb7bd48d74dd
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 15
Assets/Script/Entity/ModuleInfo.cs

@@ -1,15 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using System;
-
-[Serializable]
-public class ModuleInfo
-{
-    public int moduleID;
-    public int moduleType;
-    public string moduleName;
-    public bool moduleOpen;
-    public int sortWeight;
-    public List<FunctionInfo> functions;
-}

+ 0 - 11
Assets/Script/Entity/ModuleInfo.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: aca6ecf964fedf6498fbc4bc606bd3eb
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 11
Assets/Script/Entity/StepContentInfo.cs

@@ -1,11 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-[System.Serializable]
-public class StepContentInfo 
-{
-    public uint moduleID;
-    public uint functionID;
-    public List<ContentInfo> contentInfos;
-    public bool isShowState;
-}

+ 0 - 11
Assets/Script/Entity/StepContentInfo.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 843726a629289364db9b33f32832cd68
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 208
Assets/Script/Enums.cs

@@ -1,208 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace CCS.App
-{
-    public enum UdpConnectState
-    {
-        None = 0,
-        GotServerIP = 1,
-        StartConnect = 2,
-        Connected = 3,
-        NotConnect = 4,
-    }
-
-    public enum UdpConnectInfoType
-    {
-        None = 0,
-        Add = 1,
-        Remove = 2,
-        Refresh = 3,
-    }
-
-    public enum NetType
-    {
-        None =0,
-        Tcp =1,
-        Udp = 2,
-    }
-
-    public enum MessageTransportType
-    {
-        None = 0,
-        Request = 1,
-        Response = 2,
-        Broadcast = 3,
-    }
-    public enum MessageContentType
-    {
-        None = 0,
-        //udp 0-20
-        UDP_IP_INFO_BROADCAST_2C = 1,
-        UDP_IP_INFO_STATE_2S = 2,
-        UDP_IP_START_CONNECT_TCP_2C = 3,
-        UDP_IP_INFO_STATE_RESET_2C = 4,
-        //tcp 21-100
-        TCP_PLAYER_TRANSFOMR_2S = 21,// 位移变换
-        TCP_GET_FUNCTION_STATE_2C = 22,//
-        TCP_FUNCTION_STATE_2S = 23,// 功能信息更新
-        TCP_TEXT = 24,// 文本信息
-        TCP_STATE_CODE = 25,// TCP 状态码
-        TCP_FUNCTION_CONFIG = 26,// 客户端配置表
-        TCP_GET_CONFIG_2S = 27,// 获取客户端配置表
-
-        TCP_Heartbeat_2S = 50,//心跳
-        TCP_KeepAlive_2C = 51,//服务器发起的心跳
-    }
-
-    public enum NetStateCode
-    {
-        None = 0,
-        Client_Scene_Transition = 1,// 客户端场景转换
-        Client_Function_Scene_Mismatch = 2,//功能场景不匹配
-        Clinet_Function_Not_Exist = 3,//客户端功能不存在
-        Client_Scence_Not_Exist = 4,// 客户端场景不存在
-    }
-
-    public enum FunctionState
-    {
-        None = 0,
-        Open = 1,
-        Close = 2,
-        Wait = 3,
-    }
-
-    public enum FunctionType
-    {
-        None = 0,
-        GotoScence =1,//跳转场景
-        Switch =2,//功能开关
-        RangeValue = 3,// 范围值(滑动条)
-        FlowValue = 4,// 流程步骤值(步骤系列)
-    }
-
-    public enum FunctionButtonType
-    {
-        None = 0,
-        OnlyOpen = 1,
-        OpenAndClose = 2,
-    }
-
-    public enum ModuleType
-    {
-        Main = 0,
-        ThreeKingdoms = 1,// 三国
-        Medical = 2,// 医疗
-        Industrial=3,//工业
-        Chemistry = 4 ,//化学
-        Subway=5,//地铁     
-        FutureCity=6,//未来城市
-        FireSafety = 7,//火灾
-        Museum =8,//博物馆
-        Steppermachine=9,//光刻机
-        Aquarium=10,//水族馆
-                    //添加新场景标签
-        PartyBuilding=11,//党建
-    }
-
-    public enum MainFunctionType
-    {
-        MainScence = 0, // 主场景
-    }
-    public enum ThreeKingdomsFunctionType
-    {
-        None = 0,
-        Sworn_Brother = 1,//桃园三结义
-        Yuan_Men_Shoot = 2,// 辕门射戟
-        Hu_Lao_Pass = 3,// 虎牢关
-        Chi_Bi_Fire = 4,// 火烧赤壁
-        Main_Scence =5,//主场景
-    }
-
-    public enum MedicalFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入场景
-        Human_Body = 2,//人体
-        Main_Scence = 3,//主场景
-    }
-
-    public enum IndustrialFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入工业场景
-        Industria_Handle = 2,//工业操作内容
-        Main_Scence = 3,//主场景
-    }
-
-    public enum ChemistryFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入化学场景
-        Chemistry_Handle = 2,//化学操作内容
-        Main_Scence = 3,//主场景
-    }
-
-
-    public enum SubwayMapFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入地铁场景
-        Fire_Handle = 2,//地铁操作内容
-        Main_Scence = 3,//主场景
-    }
-    public enum FireSafetyFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入火灾场景
-        Fire_Handle = 2,//火灾操作内容
-        Main_Scence = 3,//主场景
-    }
-
-    public enum FutureCityFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入未来城市场景
-        Fire_Handle = 2,//未来城市操作内容
-        Main_Scence = 3,//主场景
-    }
-    public enum MuseumFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入博物馆场景
-        Museum_Handle = 2,//博物馆操作内容
-        Main_Scence = 3,//主场景
-    }
-
-    public enum SteppermachineFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入光刻机场景
-        Machine_Handle = 2,//光刻机操作内容
-        Main_Scence = 3,//主场景
-    }
-    public enum AquariumFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入工业场景
-        Aquarium_Handle = 2,//工业操作内容
-        Main_Scence = 3,//主场景
-    }
-    public enum PartyBuildingFuntionType
-    {
-        None = 0,
-        Into_Scene = 1,// 进入光刻机场景
-        PartyBuilding_Handle = 2,//光刻机操作内容
-        Main_Scence = 3,//主场景
-    }
-
-    public enum StartInspect
-    {
-        Undetected,//未检测 。。。。默认
-        To_be_tested,//待检测
-        qualified,//合格
-        Unqualified//不合格
-    }
-
-}

+ 0 - 11
Assets/Script/Enums.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: b7594c474b041144cb06acf8b7bc9235
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 2
Packages/manifest.json

@@ -14,8 +14,8 @@
     "com.unity.xr.arkit-face-tracking": "4.2.7",
     "com.unity.xr.interactionsubsystems": "1.0.1",
     "com.unity.xr.openxr": "1.5.3",
-    "jh.immersalsdk.engine": "file:D:/JiHe/ImmersalSDK/package",
-    "jh.xr.engine": "file:D:/JiHe/XRSDK/package",
+    "jh.immersalsdk.engine": "file:G:/GUnityProject/ImmersalSDK/package",
+    "jh.xr.engine": "file:G:/GUnityProject/XRSDK/package",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",

+ 2 - 2
Packages/packages-lock.json

@@ -244,7 +244,7 @@
       "url": "https://packages.unity.cn"
     },
     "jh.immersalsdk.engine": {
-      "version": "file:D:/JiHe/ImmersalSDK/package",
+      "version": "file:G:/GUnityProject/ImmersalSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {
@@ -254,7 +254,7 @@
       }
     },
     "jh.xr.engine": {
-      "version": "file:D:/JiHe/XRSDK/package",
+      "version": "file:G:/GUnityProject/XRSDK/package",
       "depth": 0,
       "source": "local",
       "dependencies": {