Browse Source

更改网络连接方式

wangxin 3 years ago
parent
commit
13ef1357be
23 changed files with 914 additions and 945 deletions
  1. 197 57
      Assets/Prefabs/MainDargGames4.prefab
  2. 46 46
      Assets/Resources/ScenesPrefab/Gongye.prefab
  3. 1 1
      Assets/Resources/ScenesPrefab/GuangKeJi 1.prefab
  4. 13 13
      Assets/Scripts/BaseManager/JsonManager.cs
  5. 18 18
      Assets/Scripts/BaseManager/Singleton-T-.cs
  6. 8 0
      Assets/XDKUnityCloudExamples/Common/Http.meta
  7. 201 0
      Assets/XDKUnityCloudExamples/Common/Http/HttpSocket.cs
  8. 1 1
      Assets/XDKUnityCloudExamples/Common/Http/HttpSocket.cs.meta
  9. 114 0
      Assets/XDKUnityCloudExamples/Common/Http/HttpTool.cs
  10. 11 0
      Assets/XDKUnityCloudExamples/Common/Http/HttpTool.cs.meta
  11. 8 0
      Assets/XDKUnityCloudExamples/Common/Materials/Materials.meta
  12. 3 6
      Assets/XDKUnityCloudExamples/Common/Scripts/Question/QuestionControl.cs
  13. 51 49
      Assets/XDKUnityCloudExamples/Common/Scripts/Test/GameManage.cs
  14. 0 0
      Assets/XDKUnityCloudExamples/Common/Scripts/Test/GameManage.cs.meta
  15. 1 1
      Assets/XDKUnityCloudExamples/Common/Scripts/Test/MapView_.cs
  16. 1 3
      Assets/XDKUnityCloudExamples/Common/Scripts/Test/TeshMap.cs
  17. 1 3
      Assets/XDKUnityCloudExamples/Common/Scripts/Test/TestTrigger.cs
  18. 2 2
      Assets/XDKUnityCloudExamples/Common/UDP/DeviceSN.cs
  19. 3 3
      Assets/XDKUnityCloudExamples/Common/UDP/Udp/BlueUdp.cs
  20. 1 0
      Assets/XDKUnityCloudExamples/Common/UDP/Udp/NetProtocol.cs
  21. 0 278
      Assets/XDKUnityCloudExamples/Common/UDP/Udp/UdpClient.cs
  22. 17 17
      Assets/XDKUnityCloudExamples/Demo/Prefabs/MapRootDemo.prefab
  23. 216 447
      Assets/XDKUnityCloudExamples/Demo/Scenes/Demo.unity

+ 197 - 57
Assets/Prefabs/MainDargGames4.prefab

@@ -211,7 +211,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2942046310108410625}
-  m_RootOrder: 4
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!108 &2727193929448854303
 Light:
@@ -669,7 +669,9 @@ Transform:
   - {fileID: 752623659}
   - {fileID: 1802815759}
   - {fileID: 2265679386199487137}
+  - {fileID: 1912980635128167891}
   - {fileID: 5427345524901389358}
+  - {fileID: 4679277269816664336}
   - {fileID: 146564287974395619}
   - {fileID: 5625681687054615046}
   m_Father: {fileID: 0}
@@ -683,11 +685,11 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2942046310108410636}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.5, y: 0.5, z: 0.5}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.25905454, y: 0.6023176, z: 0.30781695}
+  m_Center: {x: -0.018536583, y: 0.20560801, z: 0.008160739}
 --- !u!114 &4382735523033615826
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -956,7 +958,6 @@ GameObject:
   - component: {fileID: 2942046310833633923}
   - component: {fileID: 263606596}
   - component: {fileID: 1462154301568342054}
-  - component: {fileID: 5038080371587979665}
   m_Layer: 0
   m_Name: pos2
   m_TagString: Untagged
@@ -989,8 +990,8 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.8581194, y: 1, z: 0.8344417}
-  m_Center: {x: 0.055331364, y: -2.2344289e-15, z: -0.08277938}
+  m_Size: {x: 0.8581194, y: 1.140555, z: 0.90583396}
+  m_Center: {x: 0.05533141, y: 0.07027764, z: -0.0470832}
 --- !u!114 &1462154301568342054
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1035,49 +1036,6 @@ MonoBehaviour:
       Culture=neutral, PublicKeyToken=null
   initScale: {x: 0, y: 0, z: 0}
   initPosition: {x: 0, y: 0, z: 0}
---- !u!114 &5038080371587979665
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2942046310833633922}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: a27cb44a36ee2354eb7807ac60b15f56, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  PointerEnter:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
-  PointerDown:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
-  PointerClick:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
-  PointerUp:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
-  PointerExit:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
-  PointerDrag:
-    m_PersistentCalls:
-      m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
-  autoClickTime: 3
 --- !u!1 &2942046311459642863
 GameObject:
   m_ObjectHideFlags: 0
@@ -1190,6 +1148,97 @@ Transform:
   m_Father: {fileID: 2942046310108410625}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3123974811642694487
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4679277269816664336}
+  - component: {fileID: 8028329629346731082}
+  m_Layer: 0
+  m_Name: Area Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4679277269816664336
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3123974811642694487}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.395, y: 0, z: -0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2942046310108410625}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
+--- !u!108 &8028329629346731082
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3123974811642694487}
+  m_Enabled: 1
+  serializedVersion: 9
+  m_Type: 3
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 2
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 2
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: -8.806384e+20, z: 4.5904e-41, w: -5.4861243e-31}
+  m_UseBoundingSphereOverride: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
 --- !u!1 &4484261849896280709
 GameObject:
   m_ObjectHideFlags: 0
@@ -1219,7 +1268,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2942046310108410625}
-  m_RootOrder: 5
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!108 &7333244223163883443
 Light:
@@ -1310,7 +1359,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2942046310108410625}
-  m_RootOrder: 6
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
 --- !u!108 &3236623149630274342
 Light:
@@ -1372,6 +1421,97 @@ Light:
   m_UseBoundingSphereOverride: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
+--- !u!1 &5466780694406883705
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1912980635128167891}
+  - component: {fileID: 4015525113679080319}
+  m_Layer: 0
+  m_Name: Point Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &1912980635128167891
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5466780694406883705}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.455}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2942046310108410625}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!108 &4015525113679080319
+Light:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5466780694406883705}
+  m_Enabled: 1
+  serializedVersion: 9
+  m_Type: 2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
+  m_Range: 10
+  m_SpotAngle: 30
+  m_InnerSpotAngle: 21.80208
+  m_CookieSize: 10
+  m_Shadows:
+    m_Type: 0
+    m_Resolution: -1
+    m_CustomResolution: -1
+    m_Strength: 1
+    m_Bias: 0.05
+    m_NormalBias: 0.4
+    m_NearPlane: 0.2
+    m_CullingMatrixOverride:
+      e00: 1
+      e01: 0
+      e02: 0
+      e03: 0
+      e10: 0
+      e11: 1
+      e12: 0
+      e13: 0
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    m_UseCullingMatrixOverride: 0
+  m_Cookie: {fileID: 0}
+  m_DrawHalo: 0
+  m_Flare: {fileID: 0}
+  m_RenderMode: 0
+  m_CullingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_RenderingLayerMask: 1
+  m_Lightmapping: 4
+  m_LightShadowCasterMode: 0
+  m_AreaSize: {x: 1, y: 1}
+  m_BounceIntensity: 1
+  m_ColorTemperature: 6570
+  m_UseColorTemperature: 0
+  m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_UseBoundingSphereOverride: 0
+  m_ShadowRadius: 0
+  m_ShadowAngle: 0
 --- !u!1001 &2942046310531273977
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1579,11 +1719,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 2942046312001311896}
     m_Modifications:
-    - target: {fileID: 3401288987323543784, guid: fa45140108c783b449d3419290eb6ff1,
-        type: 3}
-      propertyPath: m_Name
-      value: ChinaBrock Mesh Sequence Player
-      objectReference: {fileID: 0}
     - target: {fileID: 3401288987323543780, guid: fa45140108c783b449d3419290eb6ff1,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -1654,6 +1789,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.744
       objectReference: {fileID: 0}
+    - target: {fileID: 3401288987323543784, guid: fa45140108c783b449d3419290eb6ff1,
+        type: 3}
+      propertyPath: m_Name
+      value: ChinaBrock Mesh Sequence Player
+      objectReference: {fileID: 0}
     - target: {fileID: 3401288987323543785, guid: fa45140108c783b449d3419290eb6ff1,
         type: 3}
       propertyPath: PlaybackMode

+ 46 - 46
Assets/Resources/ScenesPrefab/Gongye.prefab

@@ -35380,7 +35380,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4769834887152148662}
   m_LocalRotation: {x: 0, y: -0.8562671, z: 0, w: 0.5165333}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0.23, z: 0}
   m_LocalScale: {x: 4.985266, y: 4.985268, z: 4.985266}
   m_Children:
   - {fileID: 4766986697094570340}
@@ -117110,11 +117110,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4771656305323486884}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
-        type: 3}
-      propertyPath: m_Name
-      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -117185,6 +117180,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 5.928256
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
+        type: 3}
+      propertyPath: m_Name
+      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7"
+      objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -117275,11 +117275,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4771788907495782550}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
-        type: 3}
-      propertyPath: m_Name
-      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (3)"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -117350,6 +117345,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 5.928258
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
+        type: 3}
+      propertyPath: m_Name
+      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (3)"
+      objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -117440,11 +117440,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4766882990760333338}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
-        type: 3}
-      propertyPath: m_Name
-      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (2)"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -117515,6 +117510,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 5.9282646
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
+        type: 3}
+      propertyPath: m_Name
+      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (2)"
+      objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -117605,11 +117605,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4771745055834293878}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
-        type: 3}
-      propertyPath: m_Name
-      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (1)"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -117680,6 +117675,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 5.928261
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
+        type: 3}
+      propertyPath: m_Name
+      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (1)"
+      objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -117770,11 +117770,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4766882990760333338}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u98CE\u62473.1--11-poly (3)"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -117845,6 +117840,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.042949952
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u98CE\u62473.1--11-poly (3)"
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 612c6ac28bd9b3747a2c3ec102c291f9, type: 3}
 --- !u!4 &8526227388594014715 stripped
@@ -117860,11 +117860,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4771745055834293878}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u98CE\u62473.1--11-poly (2)"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -117935,6 +117930,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.042949926
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u98CE\u62473.1--11-poly (2)"
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 612c6ac28bd9b3747a2c3ec102c291f9, type: 3}
 --- !u!4 &8526227388706228588 stripped
@@ -117950,11 +117950,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4771656305323486884}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u98CE\u62473.1--11-poly (1)"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -118025,6 +118020,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 0.042949896
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 612c6ac28bd9b3747a2c3ec102c291f9,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u98CE\u62473.1--11-poly (1)"
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 612c6ac28bd9b3747a2c3ec102c291f9, type: 3}
 --- !u!4 &8526227388822733439 stripped
@@ -118040,11 +118040,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4771788907495782550}
     m_Modifications:
-    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
-        type: 3}
-      propertyPath: m_Name
-      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (2)"
-      objectReference: {fileID: 0}
     - target: {fileID: -4216859302048453862, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -118115,6 +118110,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 5.928259
       objectReference: {fileID: 0}
+    - target: {fileID: -927199367670048503, guid: 7d4ddc5e505708e4a80286c153d3e340,
+        type: 3}
+      propertyPath: m_Name
+      value: "4-\u72EC\u7ACB\u6563\u70ED\u5668CD7-7 (2)"
+      objectReference: {fileID: 0}
     - target: {fileID: -1504981713932161579, guid: 7d4ddc5e505708e4a80286c153d3e340,
         type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -118205,11 +118205,6 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4766724763840240328}
     m_Modifications:
-    - target: {fileID: 5235619614494977316, guid: 4c731e1ada4f68a40aa16f5c61d162c2,
-        type: 3}
-      propertyPath: m_Name
-      value: "\u673A\u7BB1"
-      objectReference: {fileID: 0}
     - target: {fileID: 6076527309621490513, guid: 4c731e1ada4f68a40aa16f5c61d162c2,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -118310,6 +118305,11 @@ PrefabInstance:
       propertyPath: m_LocalScale.z
       value: 181.8307
       objectReference: {fileID: 0}
+    - target: {fileID: 5235619614494977316, guid: 4c731e1ada4f68a40aa16f5c61d162c2,
+        type: 3}
+      propertyPath: m_Name
+      value: "\u673A\u7BB1"
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 4c731e1ada4f68a40aa16f5c61d162c2, type: 3}
 --- !u!4 &7457295815981897789 stripped

+ 1 - 1
Assets/Resources/ScenesPrefab/GuangKeJi 1.prefab

@@ -5608,7 +5608,7 @@ Transform:
   m_GameObject: {fileID: 1857017153961655410}
   m_LocalRotation: {x: 0, y: 0.9751301, z: -0, w: -0.22163351}
   m_LocalPosition: {x: 1.668, y: -0.571, z: -0.671}
-  m_LocalScale: {x: 1.1000006, y: 1.1, z: 1.1000006}
+  m_LocalScale: {x: 1.1000046, y: 1.1, z: 1.1000046}
   m_Children:
   - {fileID: 2416917184861838282}
   m_Father: {fileID: 0}

+ 13 - 13
Assets/Scripts/BaseManager/JsonManager.cs

@@ -8,7 +8,7 @@ public class JsonManager : MonoBehaviour
 {
     public const string TAG = "JsonManager";
     private static JsonManager m_Instance;
-    private UdpClient m_UdpClient;
+    //private UdpClient m_UdpClient;
 
     public static JsonManager Instance
     {
@@ -29,18 +29,18 @@ public class JsonManager : MonoBehaviour
         }
     }
 
-    public UdpClient UdpClient
-    {
-        get
-        {
-            if (null == m_UdpClient)
-            {
-                m_UdpClient = GameObject.Find("Socket").GetComponent<UdpClient>();
-            }
-            return m_UdpClient;
-        }
-        set { m_UdpClient = value; }
-    }
+    //public UdpClient UdpClient
+    //{
+    //    get
+    //    {
+    //        if (null == m_UdpClient)
+    //        {
+    //            m_UdpClient = GameObject.Find("Socket").GetComponent<UdpClient>();
+    //        }
+    //        return m_UdpClient;
+    //    }
+    //    set { m_UdpClient = value; }
+    //}
 
 
 

+ 18 - 18
Assets/Scripts/BaseManager/Singleton-T-.cs

@@ -1,20 +1,20 @@
 using System;
-	public class Singleton<T>
-	{
-		protected static readonly T ms_instance = Activator.CreateInstance<T>();
-		public static T Instance
-		{
-			get
-			{
-				return Singleton<T>.ms_instance;
-			}
-		}
-		protected Singleton()
-		{
-			this.OnInstanceCreate();
-		}
-		protected virtual void OnInstanceCreate()
-		{
-		}
-	}
+public class Singleton<T>
+{
+    protected static readonly T ms_instance = Activator.CreateInstance<T>();
+    public static T Instance
+    {
+        get
+        {
+            return Singleton<T>.ms_instance;
+        }
+    }
+    protected Singleton()
+    {
+        this.OnInstanceCreate();
+    }
+    protected virtual void OnInstanceCreate()
+    {
+    }
+}
 

+ 8 - 0
Assets/XDKUnityCloudExamples/Common/Http.meta

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

+ 201 - 0
Assets/XDKUnityCloudExamples/Common/Http/HttpSocket.cs

@@ -0,0 +1,201 @@
+using LitJson;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class HttpSocket : MonoSingleton<HttpSocket>
+{
+    public bool isOpen = true;
+    private float times = 0;
+    // Start is called before the first frame update
+    void Start()
+    {
+        InvokeRepeating("SendIpToElectric", 0, 60f);
+    }
+
+   
+
+    // Update is called once per frame
+    void Update()
+    {
+        //times += Time.deltaTime;
+        //if(times>1)
+        //{
+        //    times = 0;
+        //    Debug.Log("AAAAAAA");
+        //    SendIpToInitialize();
+        //}
+    }
+
+    /// <summary>
+    ///  初始化 获取初始JSON信息
+    /// </summary>
+    public void SendIpToInitialize()
+    {
+        SendNetConnectProtocol sendNet = new SendNetConnectProtocol();
+        // Debug.Log(DeviceSN.Instance.SendSerialBy16());
+        sendNet.Tagid = DeviceSN.Instance.SendSerialBy16();
+        sendNet.Port = 9981;
+        sendNet.ProjectID = 11;
+        string jsonData = JsonMapper.ToJson(sendNet);
+
+        //Debug.Log(jsonData);
+        //SocketSend(jsonData);
+        //JFSocket.GetInstance().SendMessage(jsonData);
+
+        HttpTool.Instance.Post("regist", jsonData, AnalysisJson);
+        //HttpTool.Instance.Get("regist", CallBack);
+    }
+
+
+    //reporter: '606bee3edfda85745b71348d',
+    //sn: '3ewqeq2e2qewe',
+    //cmd: 'insertPositionRecord',
+    //positionTs: '1617690133',
+    //project: '6067d03db492a38dfe6e2265',
+    //position: '{"x":1.3,"y":3.3,"z":1.2}',
+    //positionType: 'PointCloud',
+    /// <summary>
+    ///  同步当前位置
+    /// </summary>
+    /// <param name="pos"></param>
+    /// <param name="PointionTs"></param>
+    public void SendIpToPointPos(Vector3 pos, string PointionTs)
+    {
+        if (!isOpen) return;
+        SendNetConnectPointCloud sendNet = new SendNetConnectPointCloud();
+        sendNet.reporter = "606bee3edfda85745b71348d";
+        sendNet.sn = DeviceSN.Instance.SendSerialBy16();
+        sendNet.cmd = "insertPositionRecord";
+        sendNet.positionTs = PointionTs;
+        sendNet.project = "6067d03db492a38dfe6e2265";
+        sendNet.position.x = pos.x;
+        sendNet.position.y = pos.y;
+        sendNet.position.z = pos.z;
+        sendNet.positionType = "PointCloud";
+        //sendNet.viewpointId = viewpointId;
+        //viewpointId = "null";
+        string jsonData = JsonMapper.ToJson(sendNet);
+        // Debug.Log(jsonData);
+        // SocketSendPointCloud(jsonData);
+        // JFSocket.GetInstance().SendMessage(jsonData);
+
+        HttpTool.Instance.Post("regist", jsonData, CallBack);
+    }
+
+    //projectId:"<uuid>",
+    //sn:"<string>",
+    //cmdType:"increasePointTrigger",
+    //viewpointId:"<uuid>",
+    //triggerTs:<int64>
+    //
+    /// <summary>
+    ///  进入触发区域后向后台发送信息
+    /// </summary>
+    /// <param name="pointId"></param>
+    /// <param name="ts"></param>
+    public void SendIpToPointTrigger(string pointId, long ts)
+    {
+        if (!isOpen) return;
+        SendNetConnectPointTrigger sendNet = new SendNetConnectPointTrigger();
+        sendNet.projectId = "606bee3edfda85745b71348d";
+        sendNet.sn = DeviceSN.Instance.SendSerialBy16();
+        sendNet.viewpointId = pointId;
+        sendNet.triggerTs = ts;
+
+        string jsonData = JsonMapper.ToJson(sendNet);
+
+        Debug.Log(jsonData);
+        //SocketSendPointCloud(jsonData);
+        // JFSocket.GetInstance().SendMessage(jsonData);
+        HttpTool.Instance.Post("regist", jsonData, CallBack);
+    }
+
+    //sn: '3ewqeq2e2qewe',
+    //cmd: 'answer',
+    //correct: 2,
+    //incorrect: 1, 
+    /// <summary>
+    /// 答题结束后向服务器发送结果信息
+    /// </summary>
+    /// <param name="infor"></param>
+    public void SendIpTOQuestion(SendQuestionInfor infor)
+    {
+        if (!isOpen) return;
+        string jsonData = JsonMapper.ToJson(infor);
+        //Debug.Log("========================================="+jsonData);
+        //SocketSendPointCloud(jsonData);
+        //  JFSocket.GetInstance().SendMessage(jsonData);
+        HttpTool.Instance.Post("regist", jsonData, CallBack);
+    }
+
+    /* 电量数据结构
+     * sn: '3ewqeq2e2qewe'
+     * cmd: 'showElectricity'
+     * electricity: 20
+     * status:""
+    */
+    /// <summary>
+    /// 向服务器发送眼镜的剩余电量以及电池状态
+    /// 在start函数中使用InvokeRepeating60秒调用一次
+    /// </summary>
+    public void SendIpToElectric()
+    {
+        if (!isOpen) return;
+
+        int electricity = (int)((SystemInfo.batteryLevel) * 100f);
+        BatteryStatus batterystate = SystemInfo.batteryStatus;
+        string state = "";
+        switch (batterystate)
+        {
+            case BatteryStatus.Unknown:
+                state = "无法确定设备的电池状态";
+                break;
+            case BatteryStatus.Charging:
+                state = "设备已插入并正在充电";
+                break;
+            case BatteryStatus.Discharging:
+                state = "设备已拔出并放电";
+                break;
+            case BatteryStatus.NotCharging:
+                state = "设备已插入,但无法充电";
+                break;
+            case BatteryStatus.Full:
+                state = "设备已插入并且电池已充满";
+                break;
+            default:
+                state = "无法确定设备的电池状态";
+                break;
+        }
+        SendNetConnectElectricity sendNet = new SendNetConnectElectricity();
+        sendNet.sn = DeviceSN.Instance.SendSerialBy16();
+        sendNet.electricity = electricity;
+        sendNet.status = state;
+        string jsonData = JsonMapper.ToJson(sendNet);
+
+        // SocketSendPointCloud(jsonData);
+        // JFSocket.GetInstance().SendMessage(jsonData);
+        HttpTool.Instance.Post("regist", jsonData, CallBack);
+
+    }
+
+    /// <summary>
+    /// Post 回调
+    /// </summary>
+    /// <param name="str"></param>
+    public void  CallBack(string str)
+    {
+        //Debug.Log(str);
+
+        
+    }
+    /// <summary>
+    ///  获取初始Json成功后的回调
+    /// </summary>
+    /// <param name="str"></param>
+    public void AnalysisJson(string str)
+    {
+        GameManage.Instance.AnalysisJson(str);
+    }
+
+}

+ 1 - 1
Assets/XDKUnityCloudExamples/Common/UDP/Udp/UdpClient.cs.meta → Assets/XDKUnityCloudExamples/Common/Http/HttpSocket.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 388775950f39e7748a3ea28d401858fd
+guid: 742a3367dd6961e4aa7f15721bd3344f
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 114 - 0
Assets/XDKUnityCloudExamples/Common/Http/HttpTool.cs

@@ -0,0 +1,114 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using System;
+using UnityEngine.Networking;
+using System.Text;
+
+/// <summary>
+/// Http Request SDK 
+/// </summary>
+public class HttpTool : MonoBehaviour
+{
+
+    private static HttpTool _instacne = null;
+    private string baseUrl = "http://office.ghz-tech.com:9981";
+    private string sKey = "zoo_visit_key";
+
+    Dictionary<string, string> requestHeader = new Dictionary<string, string>();  //  header
+    public static HttpTool Instance
+    {
+        get
+        {
+            if (_instacne == null)
+            {
+                Debug.LogError("Awake error");
+            }
+            return _instacne;
+        }
+    }
+
+    void Awake()
+    {
+        DontDestroyOnLoad(gameObject);
+        HttpTool._instacne = gameObject.GetComponent<HttpTool>();
+
+        //http header 的内容
+        requestHeader.Add("Content-Type", "application/json");
+       // requestHeader.Add("sKey", sKey);
+
+    }
+
+    public void Get(string methodName, Action<string> callback)
+    {
+        StartCoroutine(GetRequest(methodName, callback));
+    }
+    private IEnumerator GetRequest(string methodName, Action<string> callback)
+    {
+        string url = baseUrl + methodName;
+        using (UnityWebRequest webRequest = UnityWebRequest.Get(url))
+        {
+            //设置header
+            foreach (var v in requestHeader)
+            {
+                webRequest.SetRequestHeader(v.Key, v.Value);
+            }
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.isHttpError || webRequest.isNetworkError)
+            {
+                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
+                if (callback != null)
+                {
+                    callback(null);
+                }
+            }
+            else
+            {
+                if (callback != null)
+                {
+                    callback(webRequest.downloadHandler.text);
+                }
+            }
+        }
+    }
+
+    //jsonString 为json字符串,post提交的数据包为json
+    public void Post(string methodName, string jsonString, Action<string> callback)
+    {
+        StartCoroutine(PostRequest(methodName, jsonString, callback));
+    }
+    private IEnumerator PostRequest(string methodName, string jsonString, Action<string> callback)
+    {
+        string url = baseUrl;
+         //Debug.Log(string.Format("url:{0} postData:{1}",url,jsonString));
+        using (UnityWebRequest webRequest = new UnityWebRequest(url, "POST"))
+        {
+            byte[] bodyRaw = Encoding.UTF8.GetBytes(jsonString);
+            webRequest.uploadHandler = (UploadHandler)new UploadHandlerRaw(bodyRaw);
+            webRequest.downloadHandler = (DownloadHandler)new DownloadHandlerBuffer();
+
+            foreach (var v in requestHeader)
+            {
+                webRequest.SetRequestHeader(v.Key, v.Value);
+            }
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.isHttpError || webRequest.isNetworkError)
+            {
+                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
+                if (callback != null)
+                {
+                    callback(null);
+                }
+            }
+            else
+            {
+                if (callback != null)
+                {
+                    callback(webRequest.downloadHandler.text);
+                }
+            }
+        }
+    }
+}

+ 11 - 0
Assets/XDKUnityCloudExamples/Common/Http/HttpTool.cs.meta

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

+ 8 - 0
Assets/XDKUnityCloudExamples/Common/Materials/Materials.meta

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

+ 3 - 6
Assets/XDKUnityCloudExamples/Common/Scripts/Question/QuestionControl.cs

@@ -19,7 +19,6 @@ public class QuestionControl : MonoBehaviour
     private List<Question> m_AlreadyQuestion;
     //所有题目
     private List<Question> m_Questions;
-    private UdpClient m_Udp;
     /// <summary>
     /// 是否向服务器发送数据
     /// </summary>
@@ -51,8 +50,6 @@ public class QuestionControl : MonoBehaviour
         m_Prefab = transform.Find("Question").gameObject;
         m_Prefab.SetActive(false);
         m_AlreadyQuestion = new List<Question>();
-        if (IsSendMsgToServer)
-            m_Udp = GameObject.Find("Socket").GetComponent<UdpClient>();
         m_Questions = new List<Question>();
         CraetQuestions();
     }
@@ -113,10 +110,10 @@ public class QuestionControl : MonoBehaviour
             if (IsSendMsgToServer)
             {
                 SendQuestionInfor questionInfor = new SendQuestionInfor();
-                questionInfor.sn = DeviceSN.GetInstance().SendSerialBy16();
+                questionInfor.sn = DeviceSN.Instance.SendSerialBy16();
                 questionInfor.correct = m_RightQuestion;
                 questionInfor.incorrect = DataManager.Instance.QuesDataMgr.QuestionList.Count - m_RightQuestion;
-                m_Udp.SendIpTOQuestion(questionInfor);
+                HttpSocket.Instance.SendIpTOQuestion(questionInfor);
             }
 
             //等待2秒后,答题面板消失,太阳系出现
@@ -167,7 +164,7 @@ public class QuestionControl : MonoBehaviour
         }
         m_P2Galax.SetActive(false);
         m_SucessPanel.SetActive(false);
-       // ChangeInputDeviceType(InputDeviceType.GGT26Dof);
+        // ChangeInputDeviceType(InputDeviceType.GGT26Dof);
     }
 
 }

+ 51 - 49
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TestJsonManage.cs → Assets/XDKUnityCloudExamples/Common/Scripts/Test/GameManage.cs

@@ -3,8 +3,9 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class TestJsonManage : MonoBehaviour
+public class GameManage : MonoSingleton<GameManage>
 {
+
     /// <summary>
     ///  显示物体
     /// </summary>
@@ -21,7 +22,6 @@ public class TestJsonManage : MonoBehaviour
     ///  MeshRoute 
     /// </summary>
     public GameObject meshRoute;
-    public UdpClient udpClient;
     public static string result;
     public static bool state = true;
     public bool isSlam = false;
@@ -40,7 +40,7 @@ public class TestJsonManage : MonoBehaviour
         list_route = new List<GameObject>();
 
         if (!isSlam)
-            UdpClient.logMBSRD += AnalysisJson;
+            HttpSocket.Instance.SendIpToInitialize();
         else
             StartCoroutine(Test());
     }
@@ -48,24 +48,26 @@ public class TestJsonManage : MonoBehaviour
     /// 处理Json 数据
     /// </summary>
     /// <param name="message"></param>
-    public void AnalysisJson( string message )
+    public void AnalysisJson(string message)
     {
         if (!state)
-            return; 
+            return;
         Debug.Log("Message  aaa  " + message);
-        if(message == ""||message == "Message")
+        if (message == "" || message == "Message")
         {
             Debug.LogError("未接受到json 数据");
-            udpClient.SendIpToBluetooth();
+            //udpClient.SendIpToBluetooth();
+            HttpSocket.Instance.SendIpToInitialize();
             return;
         }
 
-       
+
         data = JsonControl.Instance.ToJsonData(message);
-    //    Debug.Log(data.navLines.Count);
+        //    Debug.Log(data.navLines.Count);
         if (data == null)
         {
-            udpClient.SendIpToBluetooth();
+            //udpClient.SendIpToBluetooth();
+            HttpSocket.Instance.SendIpToInitialize();
             return;
         }
         if (!isInit)
@@ -91,11 +93,11 @@ public class TestJsonManage : MonoBehaviour
     /// <summary>
     ///  设置路径
     /// </summary>
-    private void SettingLuJing( Root data)
+    private void SettingLuJing(Root data)
     {
         for (int i = 0; i < data.navLines.Count; i++)
         {
-            for (int j = 0; j < data.navLines[i].points.Count-1; j++)
+            for (int j = 0; j < data.navLines[i].points.Count - 1; j++)
             {
                 GameObject route = GameObject.Instantiate(meshRoute, meshRoute.transform.parent);
                 Vector3 endPos = new Vector3((float)data.navLines[i].points[j].X, 0, (float)data.navLines[i].points[j].Y);
@@ -109,31 +111,31 @@ public class TestJsonManage : MonoBehaviour
 
     }
 
-    private void SettingLuJing(NavLinesItem data , int Index)
+    private void SettingLuJing(NavLinesItem data, int Index)
     {
         GameObject routes = new GameObject("Route" + Index.ToString());
         routes.transform.parent = meshRoute.transform.parent;
         for (int j = 0; j < data.points.Count - 1; j++)
-            {
-                GameObject route = GameObject.Instantiate(meshRoute, routes.transform);
-                Vector3 endPos = new Vector3((float)data.points[j].X, 0, (float)data.points[j].Y);
-                Vector3 exitPos = new Vector3((float)data.points[j + 1].X, 0, (float)data.points[j + 1].Y);
-              //  Debug.Log(endPos + "   " + exitPos);      
-                route.GetComponent<TestRoute>().SetRoute(endPos, exitPos , Index);
-                route.SetActive(true);
+        {
+            GameObject route = GameObject.Instantiate(meshRoute, routes.transform);
+            Vector3 endPos = new Vector3((float)data.points[j].X, 0, (float)data.points[j].Y);
+            Vector3 exitPos = new Vector3((float)data.points[j + 1].X, 0, (float)data.points[j + 1].Y);
+            //  Debug.Log(endPos + "   " + exitPos);      
+            route.GetComponent<TestRoute>().SetRoute(endPos, exitPos, Index);
+            route.SetActive(true);
 
             // 地图显示路径
-            teshMap.ADDMapRoutePoint(endPos,Index);
-                
-            }
-        teshMap.ADDMapRoutePoint(new Vector3((float)data.points[data.points.Count - 1].X, 0, (float)data.points[data.points.Count - 1].Y),Index);
-      //  teshMap.SettingMapRoute();
+            teshMap.ADDMapRoutePoint(endPos, Index);
+
+        }
+        teshMap.ADDMapRoutePoint(new Vector3((float)data.points[data.points.Count - 1].X, 0, (float)data.points[data.points.Count - 1].Y), Index);
+        //  teshMap.SettingMapRoute();
 
         list_route.Add(routes);
     }
     public void SettingLuJing(int Index)
     {
-        if(list_route ==null||list_route.Count<Index)
+        if (list_route == null || list_route.Count < Index)
         {
             Debug.LogError(" 未初始化路径 或 所选的路径不存在 ");
             return;
@@ -149,13 +151,13 @@ public class TestJsonManage : MonoBehaviour
 
     private void Update()
     {
-        if(state && UdpClient.logMBSRD!=null)
-        {
-            Debug.Log("              UdpClient.logMBSRD");
-            UdpClient.logMBSRD(result);
-        //    UdpClient.logMBSRD -= AnalysisJson;
-            //state = false;
-        }
+        //if (state && UdpClient.logMBSRD != null)
+        //{
+        //    Debug.Log("              UdpClient.logMBSRD");
+        //    UdpClient.logMBSRD(result);
+        //    //    UdpClient.logMBSRD -= AnalysisJson;
+        //    //state = false;
+        //}
 
         //times += Time.deltaTime;
         //if(times>0.5f && API_SVR.GetHead()!=null)
@@ -174,7 +176,7 @@ public class TestJsonManage : MonoBehaviour
     ///  设置物体位置 和 触发范围 
     /// </summary>
     /// <param name="data"></param>
-    private void SettingObj( Root data)
+    private void SettingObj(Root data)
     {
         for (int i = 0; i < data.navLines.Count; i++)
         {
@@ -185,7 +187,7 @@ public class TestJsonManage : MonoBehaviour
                     switch (data.navLines[i].points[j].MN)
                     {
                         case "Party":
-                            QueryBox("Party", data.navLines[i].points[j]);  
+                            QueryBox("Party", data.navLines[i].points[j]);
                             break;
                         case "Gongye":
                             QueryBox("Gongye", data.navLines[i].points[j]);
@@ -197,7 +199,7 @@ public class TestJsonManage : MonoBehaviour
                         case "Chemical":
                             QueryBox("Chemical", data.navLines[i].points[j]);
                             break;
-                        case "Museum":
+                        case "Library":
                             //// 博物馆 前4个触发器改为一个触发器
                             //int index = 0;
                             //SettingBox(list_Box[list_Box.Count - 1], new Vector3((float)data.navLines[i].points[j].X, (float)data.navLines[i].points[j].Z, (float)data.navLines[i].points[j].Y));
@@ -221,19 +223,19 @@ public class TestJsonManage : MonoBehaviour
     /// <param name="Name"></param>
     /// <param name="points"></param>
     private void QueryBox(string Name, PointsItem points)
-    { 
+    {
         for (int i = 0; i < list_Obj.Count; i++)
         {
             if (list_Obj[i].name == Name)
             {
                 SettingBox(list_Box[i], list_Obj[i], list_Crystal[i], points);
-                Debug.Log("AAAAAAAA+  "+list_Box[i].name + list_Crystal[i].name + list_Obj[i].name);
+                Debug.Log("AAAAAAAA+  " + list_Box[i].name + list_Crystal[i].name + list_Obj[i].name);
                 break;
 
             }
         }
     }
-   
+
     /// <summary>
     /// 设置物体位置 和触发范围
     /// </summary>
@@ -241,34 +243,34 @@ public class TestJsonManage : MonoBehaviour
     /// <param name="obj">显示物体</param>
     /// <param name="crystal">水晶点</param>
     /// <param name="points"></param>
-    private void SettingBox( Transform box , Transform obj, Transform crystal,  PointsItem points )
+    private void SettingBox(Transform box, Transform obj, Transform crystal, PointsItem points)
     {
-        box.position = new Vector3((float)points.X, -1f, (float)points.Y);     
+        box.position = new Vector3((float)points.X, -1f, (float)points.Y);
         crystal.position = new Vector3(box.position.x, -3f, box.position.z);
-        obj.position = new Vector3((float)points.MP[0].X, points.MP[0].Z==-1?obj.position.y:(float)points.MP[0].Z, (float)points.MP[0].Y);
+        obj.position = new Vector3((float)points.MP[0].X, points.MP[0].Z == -1 ? obj.position.y : (float)points.MP[0].Z, (float)points.MP[0].Y);
         Debug.Log(obj.name + "       " + obj.position);
-       
+
     }
- 
+
     private void SettingBox(Transform obj, MPItem mpItem)
     {
-        obj.position = new Vector3((float)mpItem.X,mpItem.Z==-1?obj.position.y: (float)mpItem.Z, (float)mpItem.Y);
-        
+        obj.position = new Vector3((float)mpItem.X, mpItem.Z == -1 ? obj.position.y : (float)mpItem.Z, (float)mpItem.Y);
+
     }
 
     private void SettingBox(Transform obj, Vector3 mpItem)
     {
         //Debug.Log(obj.name);
-        obj.position = new Vector3((float)mpItem.x,  obj.position.y, (float)mpItem.y);
+        obj.position = new Vector3((float)mpItem.x, obj.position.y, (float)mpItem.y);
         list_Crystal[0].position = new Vector3(obj.position.x, -2.5f, obj.position.z);
-       
+
     }
 
     IEnumerator Test()
     {
         WWW www = new WWW(Application.streamingAssetsPath + "/projectInfo.json");
         yield return www;
-        string  message = www.text;
+        string message = www.text;
         Debug.Log(message);
         AnalysisJson(message);
     }

+ 0 - 0
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TestJsonManage.cs.meta → Assets/XDKUnityCloudExamples/Common/Scripts/Test/GameManage.cs.meta


+ 1 - 1
Assets/XDKUnityCloudExamples/Common/Scripts/Test/MapView_.cs

@@ -4,7 +4,7 @@ using UnityEngine;
 
 public class MapView_ : MonoBehaviour
 {
-    public TestJsonManage manage;
+    public GameManage manage;
     public TeshMap teshMap;
     public Transform player;
     public Transform map_player;

+ 1 - 3
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TeshMap.cs

@@ -25,7 +25,6 @@ public class TeshMap : MonoBehaviour
     ///  长方形地图
     /// </summary>
     public TestMapShow testMaxMapShow;
-    public UdpClient udpClient;
     public Vector2 mapSize;
     /// <summary>
     /// 场景尺寸 比例
@@ -37,7 +36,6 @@ public class TeshMap : MonoBehaviour
     /// </summary>
    // public List<Transform> listPoint;
     public LineRenderer line;
-
     List<Vector3> listPointPos;
     List<Vector3> listMapRoutePos;
     Dictionary<int, List<Vector3>> mapRoutePos;
@@ -70,7 +68,7 @@ public class TeshMap : MonoBehaviour
             Vector2 mapPos = MapPos();
             Vector3 pos = new Vector3(mapSize.x * mapPos.x, mapSize.y * mapPos.y, 0.0f);
             string Ts = ((DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000).ToString();
-            udpClient.SendIpToPointCloud(pos, Ts);
+            HttpSocket.Instance.SendIpToPointPos(pos, Ts);
 
         }
     }

+ 1 - 3
Assets/XDKUnityCloudExamples/Common/Scripts/Test/TestTrigger.cs

@@ -22,7 +22,6 @@ public class TestTrigger : MonoBehaviour
     public TeshMap teshMap;
     public TestP6Car testP6Car;
     public List<string> list_TriggerName;
-    public UdpClient udpClient;
 
     /// <summary>
     ///  4个区域的累计触发次数
@@ -75,8 +74,7 @@ public class TestTrigger : MonoBehaviour
             {
                 if (state)
                 {
-                    udpClient.viewpointId = list_TriggerName[i < 4 ? 0 : i % 3];
-                    udpClient.SendIpToPointTrigger(list_TriggerName[i < 4 ? 0 : i % 3], AllTool.GetTimeStamp());
+                    HttpSocket.Instance.SendIpToPointTrigger(list_TriggerName[i < 4 ? 0 : i % 3], AllTool.GetTimeStamp());
                 }
                 // 擎天柱大模型关闭
                 if (!state && i < list_Effects.Count && list_Effects[i].name == "P6")

+ 2 - 2
Assets/XDKUnityCloudExamples/Common/UDP/DeviceSN.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-public class DeviceSN : Singleton_<DeviceSN>
+public class DeviceSN : Singleton<DeviceSN>
 {
     private string serial;
     
@@ -25,7 +25,7 @@ public class DeviceSN : Singleton_<DeviceSN>
 #if UNITY_EDITOR
         return "ABD1234561";
 #elif UNITY_ANDROID
-        return Convert.ToString(DeviceSN.GetInstance().SendSerial(), 16);
+        return Convert.ToString(DeviceSN.Instance.SendSerial(), 16);
 #endif
     }
 

+ 3 - 3
Assets/XDKUnityCloudExamples/Common/UDP/Udp/BlueUdp.cs

@@ -76,8 +76,8 @@ public class BlueUdp : MonoBehaviour
             //print(recvStr+"消息");
             Debug.Log(recvStr + "Idear");
 
-            TestJsonManage.state = true;
-            TestJsonManage.result = recvStr.Trim();
+            //TestJsonManage.state = true;
+            //TestJsonManage.result = recvStr.Trim();
             //SlamBlueManager.isBQREC = true;
             //SlamBlueManager.bQResult = recvStr.Trim();
         }
@@ -121,7 +121,7 @@ public class BlueUdp : MonoBehaviour
     public void SendIpToBluetooth()
     {
         SendNetConnectProtocolBlue sendNet = new SendNetConnectProtocolBlue();
-        sendNet.Tagid = DeviceSN.GetInstance().SendSerialBy16();
+        sendNet.Tagid = DeviceSN.Instance.SendSerialBy16();
         sendNet.Port = 9981;
         sendNet.ProjectId = 44;
         string jsonData = JsonMapper.ToJson(sendNet);

+ 1 - 0
Assets/XDKUnityCloudExamples/Common/UDP/Udp/NetProtocol.cs

@@ -15,6 +15,7 @@ public class SendNetConnectProtocol
 {
     public string Tagid { get; set; }
     public int Port { get; set; }
+    public int ProjectID { get; set; }
 }
 
 public class SendNetConnectPointCloud

+ 0 - 278
Assets/XDKUnityCloudExamples/Common/UDP/Udp/UdpClient.cs

@@ -1,278 +0,0 @@
-using LitJson;
-using System.Collections;
-//引入库
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-using UnityEngine;
-
-public class UdpClient : MonoBehaviour
-{
-    public delegate void logMessagaeBarScanResultDelegat(string message);
-    public static logMessagaeBarScanResultDelegat logMBSRD;
-    public bool isOpen = true;
-    public string viewpointId = "null";
-    private static UdpClient instance;
-
-    //以下默认都是私有的成员
-    string AddressIP;//获取ip
-    Socket socket; //目标socket
-    EndPoint serverEnd; //服务端
-    IPEndPoint ipEnd; //服务端端口
-    IPEndPoint ipSocketEnd;//蓝牙服务端口
-    IPEndPoint ipSocketPC; //点云服务端口
-
-    IPEndPoint ipSocketPCTest;// 测试
-    string recvStr; //接收的字符串
-    string sendStr; //发送的字符串
-    byte[] recvData = new byte[4096]; //接收的数据,必须为字节
-    byte[] sendData = new byte[4096]; //发送的数据,必须为字节
-    int recvLen; //接收的数据长度
-    Thread connectThread; //连接线程
-
-    private UdpClient()
-    {
-
-    }
-    public static UdpClient Instance()
-    {
-        if (instance == null)
-            instance = new UdpClient();
-        return instance;
-    }
-    //初始化
-    void InitSocket()
-    {
-        //定义连接的服务器ip和端口,可以是本机ip,局域网,互联网
-        //ipSocketEnd = new IPEndPoint(IPAddress.Parse("192.168.140.123"), 9981);
-
-        ipSocketPC = new IPEndPoint(IPAddress.Parse("192.168.3.66"), 9981);
-        ipSocketEnd = new IPEndPoint(IPAddress.Parse("192.168.3.66"), 9981);
-
-        ipSocketPCTest = new IPEndPoint(IPAddress.Parse("192.168.178.128"), 9981);
-
-        ipEnd = new IPEndPoint(IPAddress.Parse(AddressIP), 9981);
-        // ipEnd = new IPEndPoint(IPAddress.Parse("192.168.220.178"), 9981);
-        //定义套接字类型,在主线程中定义
-        socket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
-        socket.Bind(ipEnd);
-        //定义服务端
-        IPEndPoint sender = new IPEndPoint(IPAddress.Any, 0);
-        serverEnd = (EndPoint)sender;
-        //建立初始连接,这句非常重要,第一次连接初始化了serverEnd后面才能收到消息
-        SocketSend("hello");
-        //开启一个线程连接,必须的,否则主线程卡死
-        connectThread = new Thread(new ThreadStart(SocketReceive));
-        connectThread.Start();
-    }
-
-    void SocketSend(string sendStr)
-    {
-        //清空发送缓存
-        sendData = new byte[4096];
-        //数据类型转换
-        sendData = Encoding.ASCII.GetBytes(sendStr);
-        //发送给指定服务端
-        socket.SendTo(sendData, sendData.Length, SocketFlags.None, ipSocketEnd);
-        //  socket.SendTo(sendData, sendData.Length, SocketFlags.None, ipSocketEnd);
-    }
-
-    void SocketSendPointCloud(string sendStr)
-    {
-        //清空发送缓存
-        sendData = new byte[4096];
-        //数据类型转换
-        sendData = Encoding.ASCII.GetBytes(sendStr);
-        //发送给指定服务端
-        //Debug.Log(sendStr);
-        socket.SendTo(sendData, ipSocketPC);
-        socket.SendTo(sendData, ipSocketPCTest);
-
-    }
-
-    //服务器接收
-    void SocketReceive()
-    {
-        //进入接收循环
-        while (true)
-        {
-            //对data清零
-            recvData = new byte[4096];
-            //获取客户端,获取服务端端数据,用引用给服务端赋值,实际上服务端已经定义好并不需要赋值
-            recvLen = socket.ReceiveFrom(recvData, ref serverEnd);
-            //Debug.LogError("message from: " + serverEnd.ToString()); //打印服务端信息
-            //输出接收到的数据
-            recvStr = Encoding.ASCII.GetString(recvData, 0, recvLen);
-            TestJsonManage.result = recvStr.Trim();
-            // TestUDP.result = recvStr.Trim();
-            Debug.Log(TestJsonManage.state + "          " + "    " + logMBSRD);
-            // 当前连接 只需要传输一次数据 传输完成后关闭    
-        }
-    }
-
-    //连接关闭
-    void SocketQuit()
-    {
-        //关闭线程
-        if (connectThread != null)
-        {
-            connectThread.Interrupt();
-            connectThread.Abort();
-        }
-        //最后关闭socket
-        if (socket != null)
-            socket.Close();
-    }
-
-    // Use this for initialization
-    void Start()
-    {
-        if (!isOpen) return;
-        ///获取本地的IP地址
-        for (int i = 0; i < Dns.GetHostEntry(Dns.GetHostName()).AddressList.Length; i++)
-        {
-            if (Dns.GetHostEntry(Dns.GetHostName()).AddressList[i].AddressFamily.ToString() == "InterNetwork")
-            {
-                AddressIP = Dns.GetHostEntry(Dns.GetHostName()).AddressList[i].ToString();
-            }
-        }
-        InitSocket(); //在这里初始化
-        SendIpToBluetooth();//发送targeId,端口号
-        InvokeRepeating("SendIpToElectric", 0, 60f);
-    }
-
-    // Update is called once per frame
-    void Update()
-    {
-    }
-
-    public void SendIpToBluetooth()
-    {
-        SendNetConnectProtocol sendNet = new SendNetConnectProtocol();
-        sendNet.Tagid = DeviceSN.GetInstance().SendSerialBy16();
-        sendNet.Port = 9981;
-        string jsonData = JsonMapper.ToJson(sendNet);
-
-        //Debug.Log(jsonData);
-        SocketSend(jsonData);
-    }
-
-    //reporter: '606bee3edfda85745b71348d',
-    //sn: '3ewqeq2e2qewe',
-    //cmd: 'insertPositionRecord',
-    //positionTs: '1617690133',
-    //project: '6067d03db492a38dfe6e2265',
-    //position: '{"x":1.3,"y":3.3,"z":1.2}',
-    //positionType: 'PointCloud',
-    public void SendIpToPointCloud(Vector3 pos, string PointionTs)
-    {
-        if (!isOpen) return;
-        SendNetConnectPointCloud sendNet = new SendNetConnectPointCloud();
-        sendNet.reporter = "606bee3edfda85745b71348d";
-        sendNet.sn = DeviceSN.GetInstance().SendSerialBy16();
-        sendNet.cmd = "insertPositionRecord";
-        sendNet.positionTs = PointionTs;
-        sendNet.project = "6067d03db492a38dfe6e2265";
-        sendNet.position.x = pos.x;
-        sendNet.position.y = pos.y;
-        sendNet.position.z = pos.z;
-        sendNet.positionType = "PointCloud";
-        //sendNet.viewpointId = viewpointId;
-        //viewpointId = "null";
-        string jsonData = JsonMapper.ToJson(sendNet);
-        // Debug.Log(jsonData);
-        SocketSendPointCloud(jsonData);
-    }
-
-    //projectId:"<uuid>",
-    //sn:"<string>",
-    //cmdType:"increasePointTrigger",
-    //viewpointId:"<uuid>",
-    //triggerTs:<int64>
-    //
-    public void SendIpToPointTrigger(string pointId, long ts)
-    {
-        if (!isOpen) return;
-        SendNetConnectPointTrigger sendNet = new SendNetConnectPointTrigger();
-        sendNet.projectId = "606bee3edfda85745b71348d";
-        sendNet.sn = DeviceSN.GetInstance().SendSerialBy16();
-        sendNet.viewpointId = pointId;
-        sendNet.triggerTs = ts;
-
-        string jsonData = JsonMapper.ToJson(sendNet);
-
-        Debug.Log(jsonData);
-        SocketSendPointCloud(jsonData);
-    }
-
-    //sn: '3ewqeq2e2qewe',
-    //cmd: 'answer',
-    //correct: 2,
-    //incorrect: 1, 
-    /// <summary>
-    /// 答题结束后向服务器发送结果信息
-    /// </summary>
-    /// <param name="infor"></param>
-    public void SendIpTOQuestion(SendQuestionInfor infor)
-    {
-        if (!isOpen) return;
-        string jsonData = JsonMapper.ToJson(infor);
-        //Debug.Log("========================================="+jsonData);
-        SocketSendPointCloud(jsonData);
-    }
-
-    /* 电量数据结构
-     * sn: '3ewqeq2e2qewe'
-     * cmd: 'showElectricity'
-     * electricity: 20
-     * status:""
-    */
-    /// <summary>
-    /// 向服务器发送眼镜的剩余电量以及电池状态
-    /// 在start函数中使用InvokeRepeating60秒调用一次
-    /// </summary>
-    public void SendIpToElectric()
-    {
-        if (!isOpen) return;
-
-        int electricity = (int)((SystemInfo.batteryLevel) * 100f);
-        BatteryStatus batterystate = SystemInfo.batteryStatus;
-        string state = "";
-        switch (batterystate)
-        {
-            case BatteryStatus.Unknown:
-                state = "无法确定设备的电池状态";
-                break;
-            case BatteryStatus.Charging:
-                state = "设备已插入并正在充电";
-                break;
-            case BatteryStatus.Discharging:
-                state = "设备已拔出并放电";
-                break;
-            case BatteryStatus.NotCharging:
-                state = "设备已插入,但无法充电";
-                break;
-            case BatteryStatus.Full:
-                state = "设备已插入并且电池已充满";
-                break;
-            default:
-                state = "无法确定设备的电池状态";
-                break;
-        }
-        SendNetConnectElectricity sendNet = new SendNetConnectElectricity();
-        sendNet.sn = DeviceSN.GetInstance().SendSerialBy16();
-        sendNet.electricity = electricity;
-        sendNet.status = state;
-        string jsonData = JsonMapper.ToJson(sendNet);
-
-        SocketSendPointCloud(jsonData);
-        //SocketSend(jsonData);
-        // Debug.Log("SendIpToElectric");
-    }
-
-    void OnApplicationQuit()
-    {
-        SocketQuit();
-    }
-}

+ 17 - 17
Assets/XDKUnityCloudExamples/Demo/Prefabs/MapRootDemo.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &204868840388149602
+--- !u!1 &6008978568096173537
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,9 +8,9 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 8413061068022787735}
-  - component: {fileID: 3276927840698094238}
-  - component: {fileID: 2759018889459289415}
+  - component: {fileID: 2913544025371769177}
+  - component: {fileID: 5753785799136538732}
+  - component: {fileID: 5796085980885781016}
   m_Layer: 0
   m_Name: fused_new
   m_TagString: Untagged
@@ -18,35 +18,35 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8413061068022787735
+--- !u!4 &2913544025371769177
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 204868840388149602}
+  m_GameObject: {fileID: 6008978568096173537}
   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_Children: []
-  m_Father: {fileID: 9002141817619725540}
+  m_Father: {fileID: 1455016634030689627}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &3276927840698094238
+--- !u!33 &5753785799136538732
 MeshFilter:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 204868840388149602}
+  m_GameObject: {fileID: 6008978568096173537}
   m_Mesh: {fileID: -8670151273213183110, guid: 4931ea7a720b57d4f97e6c869524e39e, type: 3}
---- !u!23 &2759018889459289415
+--- !u!23 &5796085980885781016
 MeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 204868840388149602}
+  m_GameObject: {fileID: 6008978568096173537}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -78,7 +78,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!1 &3044444946718204525
+--- !u!1 &6317753261142779520
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -86,7 +86,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 6
   m_Component:
-  - component: {fileID: 9002141817619725540}
+  - component: {fileID: 1455016634030689627}
   m_Layer: 0
   m_Name: MapRootDemo
   m_TagString: Untagged
@@ -94,18 +94,18 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &9002141817619725540
+--- !u!4 &1455016634030689627
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3044444946718204525}
+  m_GameObject: {fileID: 6317753261142779520}
   m_LocalRotation: {x: -0.048751663, y: 0.781333, z: 0.052269842, w: 0.620008}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -5.331394, y: 0, z: 4.7084546}
   m_LocalScale: {x: 1.39437, y: 1.39437, z: 1.39437}
   m_Children:
-  - {fileID: 8413061068022787735}
+  - {fileID: 2913544025371769177}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

File diff suppressed because it is too large
+ 216 - 447
Assets/XDKUnityCloudExamples/Demo/Scenes/Demo.unity


Some files were not shown because too many files changed in this diff