Browse Source

局域网

DGJQN 2 năm trước cách đây
mục cha
commit
c5d5381a21

+ 3 - 3
Assets/GHZAlter/LANScene.unity

@@ -613,7 +613,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 01d37a7c08b33a84dace09d3cee29dfa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isServer: 1
+  isServer: 0
 --- !u!114 &170996829
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1515,7 +1515,7 @@ Transform:
   m_Children:
   - {fileID: 963723232}
   m_Father: {fileID: 0}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &605887975
 MonoBehaviour:
@@ -2809,7 +2809,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!114 &1097794228
 MonoBehaviour:

+ 1 - 1
Assets/GHZAlter/NetWorkLAN/NetWorkLANManager.cs

@@ -29,7 +29,7 @@ public class NetWorkLANManager : SingletonMono<NetWorkLANManager>
         else
             client.enabled = true;
 
-        TimerMgr.Instance.CreateTimer(() => { RecMessage(); }, 0.05f, -1);
+        TimerMgr.Instance.CreateTimer(() => { RecMessage(); }, 0.1f, -1);
     }
 
     public void SendData(string msg)

+ 39 - 10
Assets/GHZAlter/NetWorkLAN/client.cs

@@ -24,17 +24,20 @@ public class client : MonoBehaviour
 
     private bool isConnect = false;
     private float times = 0;
-
+    private string ipPath;
     public Queue<String> queueRecMsg;
     void Start()
     {
-         ClickConnect();
+        ipPath = Application.persistentDataPath + "/Ipconfig/" + "ip.txt";
+        Debug.Log(ipPath);
+        SettingIP();
+        // ClickConnect();
 
-        TimerMgr.Instance.CreateTimer(()=> { SendData(); }, 0.2f, -1);
+        TimerMgr.Instance.CreateTimer(()=> { SendData(); }, 0.1f, -1);
         queueRecMsg = new Queue<string>();
+
     }
 
-    // Update is called once per frame
     void Update()
     {
         if(!isConnect)
@@ -43,11 +46,42 @@ public class client : MonoBehaviour
             if(times>3f)
             {
                 times = 0;
-            //    ClickConnect();
+                ClickConnect();
             }
         }
     }
 
+    private void SettingIP()
+    {
+        if (File.Exists(ipPath))
+        {
+            FileStream fileStream = new FileStream(ipPath, FileMode.Open, FileAccess.Read);
+            fileStream.Seek(0, SeekOrigin.Begin);
+            //创建文件长度缓冲区
+            byte[] bytes = new byte[fileStream.Length];
+            //读取文件
+            fileStream.Read(bytes, 0, (int)fileStream.Length);
+            //释放文件读取流
+            fileStream.Close();
+            fileStream.Dispose();
+            fileStream = null;
+
+            inputIp = System.BitConverter.ToString(bytes);
+            ClickConnect();
+        }
+        else
+        {
+            Directory.CreateDirectory(Application.persistentDataPath + "/Ipconfig");
+            FileInfo fileInfo = new FileInfo(ipPath);
+            //设置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.Close();
+            SettingIP();
+        }
+    }
+
     //建立链接
     private void ClickConnect()
     {
@@ -132,10 +166,7 @@ public class client : MonoBehaviour
                 Message = NetWorkLANManager.Instance.queueMsg.Dequeue();
                 clickSend = true;
             }
-
-           
         }
-
     }
 
     /// <summary>
@@ -154,8 +185,6 @@ public class client : MonoBehaviour
                     clickSend = false;
                     if (socketSend.Connected)
                     {
-                       
-                        
                         byte[] buffer = new byte[1024 * 6];
                         buffer = Encoding.UTF8.GetBytes(Message);
                         socketSend.Send(buffer);

+ 1 - 1
Assets/GHZAlter/NetWorkLAN/server.cs

@@ -33,7 +33,7 @@ public class server : MonoBehaviour
     {
         inputIp = GetIP();
         ClickConnect();
-        TimerMgr.Instance.CreateTimer(() => { SendData(); }, 0.2f, -1);
+        TimerMgr.Instance.CreateTimer(() => { SendData(); }, 0.1f, -1);
         queueRecMsg = new Queue<string>();
 
       //  Debug.Log(GetIP());

+ 22 - 20
Assets/GHZAlter/Synchorize/ModelSynchronize.cs

@@ -110,12 +110,12 @@ public class ModelSynchronize : MonoBehaviour
 
             //transform.localPosition = Vector3.Lerp(transform.localPosition, data.transformData.pos, (Time.deltaTime * 3f));
             Quaternion q = Quaternion.Euler(data.transformData.eul);
-            transform.localRotation = Quaternion.Lerp(transform.localRotation, q, (Time.deltaTime * 3f));
+            transform.localRotation = Quaternion.Lerp(transform.localRotation, q, 0.2f);
         
 
       
         //  transform.DOScale(data.transformData.scale, doTimes);
-        transform.localScale = Vector3.Lerp(transform.localScale, data.transformData.scale, (Time.deltaTime * 3f));
+        transform.localScale = Vector3.Lerp(transform.localScale, data.transformData.scale, 0.2f);
      //   transform.localScale = Vector3.Lerp(transform.localScale, data.transformData.scale, Time.deltaTime * 10f);
 
         transferCeel.IsDragEnable = data.isShowBox;
@@ -166,9 +166,7 @@ public class ModelSynchronize : MonoBehaviour
 
     public void isShowBox( bool value)
     {
-        data.isShowBox = value;
-        isSyn = value;
-      
+        data.isShowBox = value;     
         EditorModelManager.Instance.SetModelEditor(Vector3.zero, Vector3.zero, value,data.id);
     }
 
@@ -176,34 +174,38 @@ public class ModelSynchronize : MonoBehaviour
     private Vector3 forwad;
     public void isSnatch(TransferState state)
     {
-        //bool value = state == TransferState.Start ? true : false;
+        bool value = state == TransferState.Start ? true : false;
 
-       
+        if (data.isSnatch != value && value)
+        {
+            isOwnDo = value;
+            point = transferCeel.GetCastPoint(API_GSXR_Slam.GSXR_Get_Head().position);
+            point.y -= 0.1f;
 
-        //if (data.isSnatch != value&&value)
-        //{
-        //    isOwnDo = value;
-        //    point = transferCeel.GetCastPoint(API_GSXR_Slam.GSXR_Get_Head().position);
-        //    point.y -= 0.1f;
+            forwad = point - transform.position;
+            forwad.y = 0;
 
-        //    forwad = point - transform.position;
-        //    forwad.y = 0;
 
+            EditorModelManager.Instance.SetModelEditor(point, -forwad, !value, data.id);
+        }
 
-        //    EditorModelManager.Instance.SetModelEditor(point, -forwad, !value,data.id);
-        //}
-  
-        //data.isSnatch = value;
+        data.isSnatch = value;
     }
 
     public void isSnatch(bool value)
     {
+        isSyn = value;
         if (isOwnDo == value)
             return;
         if (!value)
+        {
             GetData();
-        isOwnDo = value;
-        data.isSnatch = value;
+            isOwnDo = value;
+        }
+           
+       // isOwnDo = value;
+      
+       // data.isSnatch = value;
         point = transferCeel.GetCastPoint(API_GSXR_Slam.GSXR_Get_Head().position);
         point.y -= 0.1f;
         forwad = point - transform.position;

+ 4 - 1
Assets/GHZAlter/Synchorize/SynchronizeManager.cs

@@ -21,7 +21,7 @@ public class SynchronizeManager : SingletonMono<SynchronizeManager>
       
         queueSendData = new Queue<string>();
 
-        TimerMgr.Instance.CreateTimer(()=> { SynModel(); }, 0.5f, -1);
+        TimerMgr.Instance.CreateTimer(()=> { SynModel(); }, 0.2f, -1);
         modelNume = 1;
 
 
@@ -89,6 +89,9 @@ public class SynchronizeManager : SingletonMono<SynchronizeManager>
             if (listModel[i].isSyn)
             {
                 listData.Add(listModel[i].GetData());
+
+                if (!listModel[i].isPlayer)
+                    listModel[i].isSyn = false;
             }
         }
         MessageData MsgData = new MessageData("SynchModel", listData, null, null);

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from SK-20211220VCWK at 2023/3/16 10:58:14
+Build from SK-20211220VCWK at 2023/3/16 18:27:46