局域网修改

Assets/GHZAlter/NetWorkLAN/client.cs

@@ -22,7 +22,7 @@ public class client : MonoBehaviour
     private Socket socketSend;                   //客户端套接字，用来链接远端服务器
     private bool clickSend = false;              //是否点击发送按钮
 
-    private bool isConnect = false;
+    private bool isConnect = true;
     private float times = 0;
     private string ipPath;
     public Queue<String> queueRecMsg;
@@ -66,7 +66,8 @@ public class client : MonoBehaviour
             fileStream.Dispose();
             fileStream = null;
 
-            inputIp = System.BitConverter.ToString(bytes);
+            inputIp = System.Text.Encoding.Default.GetString(bytes);
+           // inputIp = System.BitConverter.ToString(bytes);
             ClickConnect();
         }
         else
@@ -76,7 +77,7 @@ public class client : MonoBehaviour
             //设置Log文件输出地址
             FileStream FileWriter = fileInfo.Open(FileMode.Create, FileAccess.ReadWrite, FileShare.Read);
             UTF8Encoding encoding = new UTF8Encoding();
-            FileWriter.Write(encoding.GetBytes("192.168.50.17"), 0, encoding.GetByteCount("192.168.50.17"));
+            FileWriter.Write(encoding.GetBytes("192.168.50.211"), 0, encoding.GetByteCount("192.168.50.211"));
             FileWriter.Close();
             SettingIP();
         }

Assets/GHZAlter/Synchorize/EditorModelManager.cs

@@ -6,6 +6,7 @@ using UnityEngine;
 public class EditorModelManager : SingletonMono<EditorModelManager>
 {
     public string modelId;
+    private GameObject btn;
     public void SetModelEditor( Vector3 pos, Vector3 eul,bool state , string modelId )
     {
         if (state)
@@ -13,7 +14,9 @@ public class EditorModelManager : SingletonMono<EditorModelManager>
         transform.position = pos;
         transform.LookAt(API_GSXR_Slam.GSXR_Get_Head());
         transform.eulerAngles = new Vector3(0, transform.eulerAngles.y, 0);
-        gameObject.SetActive(state);
+        if (btn == null)
+            btn = transform.GetChild(0).gameObject;
+        btn.SetActive(state);
     }
 
     public void DelModelOnClick()
@@ -23,4 +26,6 @@ public class EditorModelManager : SingletonMono<EditorModelManager>
         modelId = "";
         gameObject.SetActive(false);
     }
+
+
 }

Assets/GHZAlter/Synchorize/ModelSynchronize.cs

@@ -195,17 +195,17 @@ public class ModelSynchronize : MonoBehaviour
     public void isSnatch(bool value)
     {
         isSyn = value;
-        if (isOwnDo == value)
-            return;
+       
         if (!value)
         {
             GetData();
             isOwnDo = value;
         }
-           
-       // isOwnDo = value;
-      
-       // data.isSnatch = value;
+        //if (isOwnDo == value)
+        //    return;
+        // isOwnDo = value;
+
+        // data.isSnatch = value;
         point = transferCeel.GetCastPoint(API_GSXR_Slam.GSXR_Get_Head().position);
         point.y -= 0.1f;
         forwad = point - transform.position;

Assets/GHZAlter/Synchorize/SynchronizeManager.cs

@@ -52,26 +52,26 @@ public class SynchronizeManager : SingletonMono<SynchronizeManager>
                 break;
 
             case "SynchModel":
-                //for (int i = 0; i < data.listModelData.Count; i++)
-                //{
-                //    Debug.Log(data.listModelData[i].id);
-                //    MsgHandler.SendMsg(data.listModelData[i].id, data.listModelData[i]);
-                //}
-                Debug.Log("SynchModel");
-                if (data.listModelData != null&& listModel!=null)
-                for (int i = 0; i < listModel.Count; i++)
+                for (int i = 0; i < data.listModelData.Count; i++)
                 {
-                    for (int j = 0; j < data.listModelData.Count; j++)
-                    {
+                    Debug.Log(data.listModelData[i].id);
+                    MsgHandler.SendMsg(data.listModelData[i].id, data.listModelData[i]);
+                }
+                //Debug.Log("SynchModel");
+                //if (data.listModelData != null&& listModel!=null)
+                //for (int i = 0; i < listModel.Count; i++)
+                //{
+                //    for (int j = 0; j < data.listModelData.Count; j++)
+                //    {
                       
-                       if(listModel[i].id == data.listModelData[j].id)
-                        {
-                            Debug.Log(data.listModelData[j].id);
-                            listModel[i].SetData(data.listModelData[j]);
-                        }
-                    }
+                //       if(listModel[i].id == data.listModelData[j].id)
+                //        {
+                //            Debug.Log(data.listModelData[j].id);
+                //            listModel[i].SetData(data.listModelData[j]);
+                //        }
+                //    }
 
-                }
+                //}
 
                 break;
 
@@ -86,12 +86,12 @@ public class SynchronizeManager : SingletonMono<SynchronizeManager>
         for (int i = 0; i < listModel.Count; i++)
         {
 
-            if (listModel[i].isSyn)
+            if (listModel[i].isSyn&&listModel[i].isOwnDo||listModel[i].isPlayer)
             {
                 listData.Add(listModel[i].GetData());
 
-                if (!listModel[i].isPlayer)
-                    listModel[i].isSyn = false;
+                //if (!listModel[i].isPlayer)
+                //    listModel[i].isSyn = false;
             }
         }
         MessageData MsgData = new MessageData("SynchModel", listData, null, null);

Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2023/3/16 18:27:46
+Build from SK-20211220VCWK at 2023/3/17 17:31:03

Assets/Studio/XRLib/Codes/PublicTools/Bounding/XBoundingBox.cs

@@ -30,7 +30,7 @@ namespace XRTool.Util
         /// <param name="color"></param>
         public void SetZoomColor(bool isLock, Color color)
         {
-          //  Debug.Log("SetZoomColor  " + isLock);
+            Debug.Log("SetZoomColor  " + isLock);
             List<Handle> hands = new List<Handle>();
             hands.AddRange(SideBoundingBoxRoot.handles);
             hands.AddRange(CornerBoundingBoxRoot.handles);

Assets/Studio/_4ShowScene/BoardFunctionModule/Scripts/TransferCell.cs

@@ -321,6 +321,9 @@ namespace ShadowStudio.Tool
         /// </summary>
         public void OnRotateStopped()
         {
+            Debug.Log("OnRotateStopped");
+            if (modelSync != null)
+                modelSync.isSnatch(false);
             ClearEditor();
             editType = 1;
             RoteTransfer?.Invoke(TransferState.Stop);
@@ -331,6 +334,9 @@ namespace ShadowStudio.Tool
         /// </summary>
         private void OnRotateStarted()
         {
+            Debug.Log("OnRotateStarted");
+            if (modelSync != null)
+                modelSync.isSnatch(true);
             ClearEditor();
             editType = 1;
             RoteTransfer?.Invoke(TransferState.Start);
@@ -341,6 +347,9 @@ namespace ShadowStudio.Tool
         /// </summary>
         public void OnScaleStopped()
         {
+            if (modelSync != null)
+                modelSync.isSnatch(false);
+            Debug.Log("OnScaleStopped");
             ClearEditor();
             editType = 2;
             ZoomTransfer?.Invoke(TransferState.Stop);
@@ -353,6 +362,9 @@ namespace ShadowStudio.Tool
         /// </summary>
         private void OnScaleStarted()
         {
+            if (modelSync != null)
+                modelSync.isSnatch(true);
+            Debug.Log("OnScaleStarted");
             ClearEditor();
             editType = 2;
             ZoomTransfer?.Invoke(TransferState.Start);

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: shadowcreator
-  productName: MRSpaceLAN
+  productName: MRSpace(Client)
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}