修改接口

Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_galaxy.mat

@@ -48,7 +48,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     m_Floats:
-    - _GIntensity: 0.1
+    - _GIntensity: 0
     - _Intensity: 0
     - _SIntensity: 1
     - _perturbation: 0.405

Assets/3rdParty/TENKOKU - DYNAMIC SKY/TEXTURES/mat_moon.mat

@@ -33,7 +33,7 @@ Material:
     - _overBright: 1
     m_Colors:
     - _AmbientTint: {r: 1, g: 1, b: 1, a: 1}
-    - _Color: {r: 0, g: 0, b: 0, a: 1}
+    - _Color: {r: 0.5, g: 0.49803922, b: 0.49215686, a: 0.2}
     - _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}

Assets/Temp/Scripts/View_Panel2.cs

@@ -248,19 +248,19 @@ public class View_Panel2 : XUIPanel
 
     public void OnRegisterFunction()
     {
-        AdamSync.SyncCreateRoom.createRoomRequset += OnCreateRoom;
+        //AdamSync.SyncCreateRoom.createRoomRequset += OnCreateRoom;
         AdamSync.SyncCreateRoom.joinRoomRequset += OnJoinRoom;
-        AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
+        //AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
     }
 
-    public void OnGetRooms(string msg)
-    {
-        Debug.Log("OnGetRooms====" + msg);
-    }
-    public void OnCreateRoom(string msg)
-    {
-        Debug.Log("OnCreateRoom====" + msg);
-    }
+    //public void OnGetRooms(string msg)
+    //{
+    //    Debug.Log("OnGetRooms====" + msg);
+    //}
+    //public void OnCreateRoom(string msg)
+    //{
+    //    Debug.Log("OnCreateRoom====" + msg);
+    //}
     public void OnJoinRoom(string msg)
     {
         Debug.Log("OnJoinRoom===" + msg);
@@ -545,7 +545,7 @@ public class View_Panel2 : XUIPanel
             GlobalFlag.practiceId = roomItem.name;
             GlobalFlag.currentThinkId = roomItem.name;
             UIBootstrap.Instance.GetSceneData(GlobalFlag.practiceId);
-
+            UIBootstrap.Instance.GetAllDeviceData();
             Debug.Log(" roomItem.nameID==" + roomItem.name);
             CreateSubjectItem(currentRoomData.data);
         });
@@ -853,16 +853,16 @@ public class View_Panel2 : XUIPanel
     private void OnDisable()
     {
         Debug.Log("OnDisable");
-        AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
+        //AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
         AdamSync.SyncCreateRoom.joinRoomRequset += OnJoinRoom;
-        AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
+        //AdamSync.SyncCreateRoom.getRoomsRequset += OnGetRooms;
     }
     private void OnDestory()
     {
         Debug.Log("OnDestory");
-        AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
+        //AdamSync.SyncCreateRoom.createRoomRequset -= OnCreateRoom;
         AdamSync.SyncCreateRoom.joinRoomRequset -= OnJoinRoom;
-        AdamSync.SyncCreateRoom.getRoomsRequset -= OnGetRooms;
+        //AdamSync.SyncCreateRoom.getRoomsRequset -= OnGetRooms;
     }
 }
 

Assets/Zion/Scenes/InitConnect.unity

@@ -202,6 +202,10 @@ MonoBehaviour:
       Field_Char3: 
   subjectInfo: []
   traininginformations: []
+  thinkDevicesData:
+    state: 
+    message: 
+    data: []
 --- !u!1 &2132962757
 GameObject:
   m_ObjectHideFlags: 0
@@ -232,7 +236,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   isLinkAgain: 0
-  serverIP: 172.16.1.35
+  serverIP: 127.0.0.1
   port: 12345
 --- !u!4 &2132962759
 Transform:

Assets/Zion/Scripts/Adam/DragController.cs

@@ -37,10 +37,11 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler,
     {
         if (model != null)
         {
-            model.GetComponent<UnmannedAerialVehicleManage>().isStartRehearsing = GlobalFlag.isStartRehearsing;
 
+            model.GetComponent<UnmannedAerialVehicleManage>().isStartRehearsing = GlobalFlag.isStartRehearsing;
             List<List_paraItem> temp = UIBootstrap.Instance.GetListParaItemById(deviceID);
-            model.GetComponent<UnmannedAerialVehicleManage>().FillInTheData(temp);
+
+            //model.GetComponent<UnmannedAerialVehicleManage>().FillInTheData(temp);
             if (DragManager.Instance != null)
             {
                 DragManager.Instance.AddObj(model);//把对应模型传入链表

Assets/Zion/Scripts/Adam/UIBootstrap.cs

@@ -52,7 +52,7 @@ public class UIBootstrap : MonoSingleton<UIBootstrap>
         for (int i = 0; i < thinkDevicesData.data.Count; i++)
         {
             if (thinkDevicesData.data[i].device_name == deviceName)
-                detaIteml = thinkDevicesData.data[i];
+                return thinkDevicesData.data[i];
         }
         return detaIteml;
     }