diff --git a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat
index 846a590c..44f8ade1 100644
--- a/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat	
+++ b/Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat	
@@ -32,8 +32,8 @@ Material:
     - _dispStrength: 1
     - _overBright: 1
     m_Colors:
-    - _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
+    - _AmbientTint: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 0.25, g: 0.25, b: 0.25, a: 0.040000003}
     - _GlowColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
     - _PrimaryTint: {r: 1, g: 1, b: 1, a: 1}
     - _TintColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Zion/Scenes/InitConnect.unity b/Assets/Zion/Scenes/InitConnect.unity
index 0c9ee084..a5126104 100644
--- a/Assets/Zion/Scenes/InitConnect.unity
+++ b/Assets/Zion/Scenes/InitConnect.unity
@@ -236,7 +236,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isLinkAgain: 0
-  serverIP: 172.20.10.5
+  serverIP: 192.168.6.63
   port: 12345
 --- !u!4 &2132962759
 Transform:
diff --git a/Assets/Zion/Scripts/Adam/GameManager.cs b/Assets/Zion/Scripts/Adam/GameManager.cs
index 88441591..0af83aee 100644
--- a/Assets/Zion/Scripts/Adam/GameManager.cs
+++ b/Assets/Zion/Scripts/Adam/GameManager.cs
@@ -189,16 +189,16 @@ public class GameManager : MonoSingleton<GameManager>
                 }
                 break;
             case "无人机List":
-                SpawnDevice(wrjDrag.prefabItem, data);
+                SpawnDevice(wrjDrag.prefabItem, data[7]);
                 break;
             case "地面无线电干扰":
-                SpawnDevice(wxdDrag.prefabItem, data);
+                SpawnDevice(wxdDrag.prefabItem, data[7]);
                 break;
             case "探测雷达":
-                SpawnDevice(ldDrag.prefabItem, data);
+                SpawnDevice(ldDrag.prefabItem, data[7]);
                 break;
             case "激光火控平台":
-                SpawnDevice(hpDrag.prefabItem, data);
+                SpawnDevice(hpDrag.prefabItem, data[7]);
                 break;
             case "Stop":
                 GlobalFlag.isStartRehearsing = false;
@@ -206,7 +206,7 @@ public class GameManager : MonoSingleton<GameManager>
                 {
                     DeviceManager.Instance.devices[i].isStartRehearsing = false;
                 }
-               
+
                 break;
             case "EndDeduction":
                 GlobalFlag.isStartRehearsing = false;
@@ -224,19 +224,58 @@ public class GameManager : MonoSingleton<GameManager>
         }
     }
 
-    public void SpawnDevice(GameObject devicePrefab, string[] data = null, string deviceID = null)
+   
+
+
+    //}
+    /// <summary>
+    /// 获取别的客户端生成得设备
+    /// </summary>
+    /// <param name="devicePrefab"></param>
+    /// <param name="data"></param>
+    /// <param name="deviceID"></param>
+    public async void SpawnDevice(GameObject devicePrefab = null, string deviceID = null)
     {
-        GameObject obj = Instantiate(devicePrefab);
-        if (string.IsNullOrEmpty(deviceID))
+        DeviceData deviceData = await AsyncWebReq.Get<DeviceData>("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=querypracticedevicedetail&PracticeId=" + GlobalFlag.roomID + "&PracticeSubjectId=" + GlobalFlag.practiceSubjectID);
+        if (devicePrefab != null && deviceID != null)
         {
-            obj.transform.position = new Vector3(float.Parse(data[1]), float.Parse(data[2]), float.Parse(data[3]));
-            obj.transform.eulerAngles = new Vector3(float.Parse(data[4]), float.Parse(data[5]), float.Parse(data[6]));
-            obj.GetComponent<EquipmentCommon>().deviceID = data[7];
+            for (int i = 0; i < deviceData.data.Count; i++)
+            {
+                if (deviceData.data[i].id == deviceID)
+                {
+                    SpawnDevice(devicePrefab, deviceData.data[i]);
+                }
+            }
         }
         else
         {
-            obj.GetComponent<EquipmentCommon>().deviceID = deviceID;
+            for (int i = 0; i < deviceData.data.Count; i++)
+            {
+                switch (deviceData.data[i].device_name)
+                {
+                    case "无人机List":
+                        SpawnDevice(wrjDrag.prefabItem, deviceData.data[i]);
+                        break;
+                    case "地面无线电干扰":
+                        SpawnDevice(wxdDrag.prefabItem, deviceData.data[i]);
+                        break;
+                    case "探测雷达":
+                        SpawnDevice(ldDrag.prefabItem, deviceData.data[i]);
+                        break;
+                    case "激光火控平台":
+                        SpawnDevice(hpDrag.prefabItem, deviceData.data[i]);
+                        break;
+                }
+            }
         }
+
+    }
+
+    public void SpawnDevice(GameObject obj, AdamThinkDevicesData.DataItem data)
+    {
+        GameObject device = Instantiate(obj);
+        device.GetComponent<EquipmentCommon>().deviceID = data.id;
+        device.GetComponent<EquipmentCommon>().FillInTheData(data.list_para);
     }
 
     private void OnGetRoomUsers(string obj)
@@ -260,37 +299,12 @@ public class GameManager : MonoSingleton<GameManager>
             }
         }
 
-        OnGetRoomDevice();
+        SpawnDevice();
 
         string msg = $"send2room online,{ulong.Parse(GlobalFlag.currentUser.user_id)},{GlobalFlag.currentUser.login_name},{ulong.Parse(GlobalFlag.roomID)}";
         _ = SyncCreateRoom.SendMessageAsync(msg);
     }
-    /// <summary>
-    /// 获取 当前房间-当前科目里的所有设备
-    /// </summary>
-    public async void OnGetRoomDevice()
-    {
-        DeviceData deviceData = await AsyncWebReq.Get<DeviceData>("http://111.229.30.246:48888/Handler/Thinkingfile.ashx?action=querypracticedevicedetail&PracticeId=" + GlobalFlag.roomID + "&PracticeSubjectId=" + GlobalFlag.practiceSubjectID);
 
-        for (int i = 0; i < deviceData.data.Count; i++)
-        {
-            switch (deviceData.data[i].device_name)
-            {
-                case "无人机List":
-                    SpawnDevice(wrjDrag.prefabItem, null, deviceData.data[i].id);
-                    break;
-                case "地面无线电干扰":
-                    SpawnDevice(wxdDrag.prefabItem, null, deviceData.data[i].id);
-                    break;
-                case "探测雷达":
-                    SpawnDevice(ldDrag.prefabItem, null, deviceData.data[i].id);
-                    break;
-                case "激光火控平台":
-                    SpawnDevice(hpDrag.prefabItem, null, deviceData.data[i].id);
-                    break;
-            }
-        }
-    }
 
 
     public void SetWeatherValue()