修改合并错误

Assets/Prefabs/Robot.prefab

@@ -1,37 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1 &5653169007685538130
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 5653169007685538133}
-  m_Layer: 0
-  m_Name: Robot
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &5653169007685538133
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5653169007685538130}
-  m_LocalRotation: {x: -0, y: 0.00059487135, z: -0, w: 0.9999998}
-  m_LocalPosition: {x: 6.43, y: -1.74, z: -1.9}
-  m_LocalScale: {x: 2, y: 2, z: 2}
-  m_Children:
-  - {fileID: 796754006676254107}
-  - {fileID: 796754006943699741}
-  m_Father: {fileID: 0}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!54 &5653169007947485835
 Rigidbody:
   m_ObjectHideFlags: 0
@@ -107,6 +75,38 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   mRobot: {fileID: 4419713850881433870}
   material: {fileID: 2100000, guid: 37ffdeb9d97292840952c48d1183d193, type: 2}
+--- !u!1 &5653169007685538130
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5653169007685538133}
+  m_Layer: 0
+  m_Name: Robot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &5653169007685538133
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5653169007685538130}
+  m_LocalRotation: {x: 0, y: 0.0005934063, z: 0, w: 0.9999999}
+  m_LocalPosition: {x: 6.43, y: -1.74, z: -1.9}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_Children:
+  - {fileID: 796754006676254107}
+  - {fileID: 796754006943699741}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0.068, z: 0}
 --- !u!1001 &5653169007526086273
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -114,71 +114,78 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5653169007685538133}
     m_Modifications:
-    - target: {fileID: -5716681864270162303, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
-      propertyPath: m_PlayAutomatically
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_RootOrder
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalScale.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalScale.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalScale.z
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: -1323028903878121218, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: 37ffdeb9d97292840952c48d1183d193, type: 2}
-    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_Name
       value: irobot
       objectReference: {fileID: 0}
@@ -186,12 +193,14 @@ PrefabInstance:
   m_SourcePrefab: {fileID: 100100000, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
 --- !u!1 &4419713851689820040 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+    type: 3}
   m_PrefabInstance: {fileID: 5653169007526086273}
   m_PrefabAsset: {fileID: 0}
 --- !u!4 &796754006676254107 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+    type: 3}
   m_PrefabInstance: {fileID: 5653169007526086273}
   m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5653169007791323143
@@ -201,83 +210,102 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 5653169007685538133}
     m_Modifications:
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.x
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.y
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.z
       value: -0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalRotation.w
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_RootOrder
       value: 1
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalScale.x
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalScale.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_LocalScale.z
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: -1323028903878121218, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
-      propertyPath: m_Materials.Array.data[0]
-      value: 
-      objectReference: {fileID: 2100000, guid: f3d2a40b9e0e3d942a6ea42996057467, type: 2}
-    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_Name
       value: irobot (1)
       objectReference: {fileID: 0}
-    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+    - target: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -1323028903878121218, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: f3d2a40b9e0e3d942a6ea42996057467, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
 --- !u!1 &4419713850881433870 stripped
 GameObject:
-  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+  m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+    type: 3}
   m_PrefabInstance: {fileID: 5653169007791323143}
   m_PrefabAsset: {fileID: 0}
 --- !u!4 &796754006943699741 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2, type: 3}
+  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 19536dcaa86ee8c419ad331cb8f6baa2,
+    type: 3}
   m_PrefabInstance: {fileID: 5653169007791323143}
   m_PrefabAsset: {fileID: 0}

Assets/XDKUnityCloudExamples/Common/Http.meta

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

Assets/XDKUnityCloudExamples/Common/Http/HttpSocket.cs

@@ -1,201 +0,0 @@
-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);
-    }
-
-}

Assets/XDKUnityCloudExamples/Common/Http/HttpSocket.cs.meta

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

Assets/XDKUnityCloudExamples/Common/Http/HttpTool.cs

@@ -1,114 +0,0 @@
-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);
-                }
-            }
-        }
-    }
-}

Assets/XDKUnityCloudExamples/Common/Http/HttpTool.cs.meta

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

Assets/XDKUnityCloudExamples/Common/Scripts/Iphone/Robot.cs

@@ -130,7 +130,7 @@ public class Robot : MonoBehaviour
                 if (robotState != "RobotTwo")
                     return;
                 break;
-            case "QuestionContral":
+            case "Chemical":
                 if (robotState != "RobotThree")
                     return;
                 break;

Assets/XDKUnityCloudExamples/Common/Scripts/WebRequest/HttpSocket.cs

@@ -13,7 +13,7 @@ public class HttpSocket : MonoSingleton<HttpSocket>
         InvokeRepeating("SendIpToElectric", 0, 60f);
     }
 
-   
+
 
     // Update is called once per frame
     void Update()
@@ -183,11 +183,11 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     /// Post 回调
     /// </summary>
     /// <param name="str"></param>
-    public void  CallBack(string str)
+    public void CallBack(string str)
     {
         Debug.Log(str);
 
-        
+
     }
     /// <summary>
     ///  获取初始Json成功后的回调
@@ -195,7 +195,7 @@ public class HttpSocket : MonoSingleton<HttpSocket>
     /// <param name="str"></param>
     public void AnalysisJson(string str)
     {
-        TestJsonManage.Instance.AnalysisJson(str);
+        GameManage.Instance.AnalysisJson(str);
     }
 
 }

Assets/XDKUnityCloudExamples/Common/Scripts/WebRequest/HttpTool.cs

@@ -96,7 +96,7 @@ public class HttpTool : MonoBehaviour
 
             if (webRequest.isHttpError || webRequest.isNetworkError)
             {
-                Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
+                //Debug.LogError(webRequest.error + "\n" + webRequest.downloadHandler.text);
                 if (callback != null)
                 {
                     callback(null);

Assets/XDKUnityCloudExamples/Common/UDP/DeviceSN.cs

@@ -1,7 +1,7 @@
 using System;
 using UnityEngine;
 
-public class DeviceSN : MonoSingleton<DeviceSN>
+public class DeviceSN : Singleton<DeviceSN>
 {
     private string serial;
     

Assets/XDKUnityCloudExamples/Demo/Scenes/Demo.unity

@@ -760,7 +760,7 @@ PrefabInstance:
     - target: {fileID: 5345065499703207676, guid: 43d4713daef50514696c818f9b64046e,
         type: 3}
       propertyPath: m_RootOrder
-      value: 16
+      value: 15
       objectReference: {fileID: 0}
     - target: {fileID: 5345065499703207676, guid: 43d4713daef50514696c818f9b64046e,
         type: 3}
@@ -3226,7 +3226,7 @@ Transform:
   m_GameObject: {fileID: 198380071}
   m_LocalRotation: {x: -0, y: 0.023755819, z: -0, w: 0.99971783}
   m_LocalPosition: {x: 1.876033, y: -1.131, z: 3.3115904}
-  m_LocalScale: {x: 1.5952014, y: 1, z: 2.7101092}
+  m_LocalScale: {x: 1.5952014, y: 1, z: 2.3195357}
   m_Children: []
   m_Father: {fileID: 1801162213}
   m_RootOrder: 9
@@ -6474,6 +6474,98 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &391209013
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 391209014}
+  - component: {fileID: 391209017}
+  - component: {fileID: 391209016}
+  - component: {fileID: 391209015}
+  m_Layer: 0
+  m_Name: RobotTwo
+  m_TagString: RobotBox
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &391209014
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 391209013}
+  m_LocalRotation: {x: -0, y: 0.023755819, z: -0, w: 0.99971783}
+  m_LocalPosition: {x: 1.62, y: -1.131, z: -0.61}
+  m_LocalScale: {x: 1.9842829, y: 1, z: 1.3889832}
+  m_Children: []
+  m_Father: {fileID: 1801162213}
+  m_RootOrder: 22
+  m_LocalEulerAnglesHint: {x: 0, y: -26.458002, z: 0}
+--- !u!65 &391209015
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 391209013}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &391209016
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 391209013}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &391209017
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 391209013}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &409304771
 GameObject:
   m_ObjectHideFlags: 0
@@ -8502,6 +8594,7 @@ Transform:
   - {fileID: 1870624492}
   - {fileID: 242924312}
   - {fileID: 885482083}
+  - {fileID: 1558279978}
   m_Father: {fileID: 875360073}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -10381,7 +10474,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 808391222}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4243ad4410dbbdf409fa282b549d9095, type: 3}
+  m_Script: {fileID: 11500000, guid: c66d33a7e2290034799edc543f5bb9b8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
 --- !u!114 &808391225
@@ -10393,7 +10486,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 808391222}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 742a3367dd6961e4aa7f15721bd3344f, type: 3}
+  m_Script: {fileID: 11500000, guid: 4e4a13bbc9978ac4e886b35d8ad78ca8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   global: 1
@@ -11052,7 +11145,7 @@ PrefabInstance:
     - target: {fileID: 1269803834018763933, guid: c2949074f3b713b4abec308e62ad895b,
         type: 3}
       propertyPath: m_RootOrder
-      value: 20
+      value: 18
       objectReference: {fileID: 0}
     - target: {fileID: 1269803834018763933, guid: c2949074f3b713b4abec308e62ad895b,
         type: 3}
@@ -12578,6 +12671,7 @@ MonoBehaviour:
   - Car
   - Solar
   - Transformers
+  robot: {fileID: 1837131629}
 --- !u!114 &970254223
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -13214,6 +13308,98 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &1047892582
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1047892583}
+  - component: {fileID: 1047892586}
+  - component: {fileID: 1047892585}
+  - component: {fileID: 1047892584}
+  m_Layer: 0
+  m_Name: RobotFour
+  m_TagString: RobotBox
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1047892583
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1047892582}
+  m_LocalRotation: {x: -0, y: 0.023755819, z: -0, w: 0.99971783}
+  m_LocalPosition: {x: 1.42, y: -1.131, z: -9.91}
+  m_LocalScale: {x: 1.9842829, y: 1, z: 1.3889832}
+  m_Children: []
+  m_Father: {fileID: 1801162213}
+  m_RootOrder: 24
+  m_LocalEulerAnglesHint: {x: 0, y: -26.458002, z: 0}
+--- !u!65 &1047892584
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1047892582}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1047892585
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1047892582}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &1047892586
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1047892582}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1070664033
 GameObject:
   m_ObjectHideFlags: 0
@@ -14233,7 +14419,7 @@ PrefabInstance:
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_RootOrder
-      value: 3
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 6007065485426162334, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
@@ -15063,7 +15249,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1242358445
 PrefabInstance:
@@ -17066,7 +17252,7 @@ PrefabInstance:
     - target: {fileID: 1269803834018763933, guid: c2949074f3b713b4abec308e62ad895b,
         type: 3}
       propertyPath: m_RootOrder
-      value: 22
+      value: 20
       objectReference: {fileID: 0}
     - target: {fileID: 1269803834018763933, guid: c2949074f3b713b4abec308e62ad895b,
         type: 3}
@@ -18745,7 +18931,7 @@ PrefabInstance:
     - target: {fileID: 1269803834018763933, guid: c2949074f3b713b4abec308e62ad895b,
         type: 3}
       propertyPath: m_RootOrder
-      value: 21
+      value: 19
       objectReference: {fileID: 0}
     - target: {fileID: 1269803834018763933, guid: c2949074f3b713b4abec308e62ad895b,
         type: 3}
@@ -19937,6 +20123,12 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1555642070}
   m_CullTransparentMesh: 0
+--- !u!4 &1558279978 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+    type: 3}
+  m_PrefabInstance: {fileID: 1798329870}
+  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1562152357 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 1469659092576718643, guid: d8791dc0c8261834c8c601971cd7091e,
@@ -20234,6 +20426,98 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1599052787}
   m_CullTransparentMesh: 0
+--- !u!1 &1603974854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1603974855}
+  - component: {fileID: 1603974858}
+  - component: {fileID: 1603974857}
+  - component: {fileID: 1603974856}
+  m_Layer: 0
+  m_Name: RobotOne
+  m_TagString: RobotBox
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1603974855
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1603974854}
+  m_LocalRotation: {x: -0, y: 0.023755819, z: -0, w: 0.99971783}
+  m_LocalPosition: {x: 2, y: -1.131, z: 2.61}
+  m_LocalScale: {x: 2.27, y: 0.89764, z: 1.68}
+  m_Children: []
+  m_Father: {fileID: 1801162213}
+  m_RootOrder: 21
+  m_LocalEulerAnglesHint: {x: 0, y: -26.458002, z: 0}
+--- !u!65 &1603974856
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1603974854}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &1603974857
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1603974854}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &1603974858
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1603974854}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &1605556405
 GameObject:
   m_ObjectHideFlags: 0
@@ -23397,6 +23681,75 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1772549914}
   m_CullTransparentMesh: 0
+--- !u!1001 &1798329870
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 630725844}
+    m_Modifications:
+    - target: {fileID: 5653169007685538130, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_Name
+      value: Robot
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -1.12
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.53
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 6.65
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.858601
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: -0.5126446
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 8
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 241.68
+      objectReference: {fileID: 0}
+    - target: {fileID: 5653169007685538133, guid: 1cee1bca5c513914bb66e250f05d93f9,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 1cee1bca5c513914bb66e250f05d93f9, type: 3}
 --- !u!1 &1801162212
 GameObject:
   m_ObjectHideFlags: 0
@@ -23446,6 +23799,10 @@ Transform:
   - {fileID: 835592945}
   - {fileID: 1497786535}
   - {fileID: 1416183431}
+  - {fileID: 1603974855}
+  - {fileID: 391209014}
+  - {fileID: 2076317741}
+  - {fileID: 1047892583}
   m_Father: {fileID: 875360073}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: -29.18, z: 0}
@@ -24228,6 +24585,18 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1828555995}
   m_CullTransparentMesh: 0
+--- !u!114 &1837131629 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 5653169007947485833, guid: 1cee1bca5c513914bb66e250f05d93f9,
+    type: 3}
+  m_PrefabInstance: {fileID: 1798329870}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8cf28d5d4d9543148abc18f67944fc5e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1838035230
 GameObject:
   m_ObjectHideFlags: 0
@@ -27749,6 +28118,98 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2069123449}
   m_Mesh: {fileID: 4767555546584458496, guid: 1753cb8656a0f40409bb34d6757f8d6c, type: 3}
+--- !u!1 &2076317740
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2076317741}
+  - component: {fileID: 2076317744}
+  - component: {fileID: 2076317743}
+  - component: {fileID: 2076317742}
+  m_Layer: 0
+  m_Name: RobotThree
+  m_TagString: RobotBox
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2076317741
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2076317740}
+  m_LocalRotation: {x: -0, y: 0.023755819, z: -0, w: 0.99971783}
+  m_LocalPosition: {x: 1.53, y: -1.23, z: -8.34}
+  m_LocalScale: {x: 1.9842829, y: 1, z: 1.3889832}
+  m_Children: []
+  m_Father: {fileID: 1801162213}
+  m_RootOrder: 23
+  m_LocalEulerAnglesHint: {x: 0, y: -26.458002, z: 0}
+--- !u!65 &2076317742
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2076317740}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!23 &2076317743
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2076317740}
+  m_Enabled: 0
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!33 &2076317744
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2076317740}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &2082260527
 GameObject:
   m_ObjectHideFlags: 0
@@ -28605,7 +29066,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2138555944
 GameObject: