From 9ef66320ae58857b8ad265ec8e8d4e4d46bcf87c Mon Sep 17 00:00:00 2001
From: gaoduo <1453062510@qq.com>
Date: Fri, 15 May 2026 17:04:48 +0800
Subject: [PATCH] 1

---
 Assets/SenSorSystem/MianQian_SenSor.cs         | 10 +++++-----
 Assets/Third/AI/Scripts/LLM/ZXK/ChatZxkAI.cs   |  9 ++++++---
 .../FSMManager/State/LianJieJiNiaoDaiState.cs  | 18 +++++++++---------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Assets/SenSorSystem/MianQian_SenSor.cs b/Assets/SenSorSystem/MianQian_SenSor.cs
index fda5dd6..339905a 100644
--- a/Assets/SenSorSystem/MianQian_SenSor.cs
+++ b/Assets/SenSorSystem/MianQian_SenSor.cs
@@ -41,14 +41,14 @@ public class MianQian_SenSor : Sensor
 
     public override void ReceiveData(string datas, SerialPort sp = null)
     {
-        base.ReceiveData(datas);
-        if (!datas.Split("OK")[0].Split("ID:")[1].Split(',')[0].Equals("MQ")) return;
+        base.ReceiveData(datas, sp);
+        if (!datas.Split("%")[0].Split("ID:")[1].Split(',')[0].Equals("MQ")) return;
         //if (!datas.Split("OK")[0].Split("ID:")[1].Split(',')[0].Equals("ZSQ20")) return;
         //this.Error(datas);
         lastTime = time;
-        X = float.Parse(datas.Split("OK")[0].Split("PIT:")[1].Split(',')[0]);
-        Y = float.Parse(datas.Split("OK")[0].Split("YAW:")[1].Split(',')[0]);
-        Z = float.Parse(datas.Split("OK")[0].Split("ROL:")[1].Split(',')[0]);
+        X = float.Parse(datas.Split("%")[0].Split("PIT:")[1].Split(',')[0]);
+        Y = float.Parse(datas.Split("%")[0].Split("YAW:")[1].Split(',')[0]);
+        Z = float.Parse(datas.Split("%")[0].Split("ROL:")[1].Split(',')[0]);
         //this.Error($"当前旋转角度为：{X},{Y},{Z}");
     }
 
diff --git a/Assets/Third/AI/Scripts/LLM/ZXK/ChatZxkAI.cs b/Assets/Third/AI/Scripts/LLM/ZXK/ChatZxkAI.cs
index 642bae3..4773496 100644
--- a/Assets/Third/AI/Scripts/LLM/ZXK/ChatZxkAI.cs
+++ b/Assets/Third/AI/Scripts/LLM/ZXK/ChatZxkAI.cs
@@ -1,10 +1,11 @@
+using DongWuYiXue.Main;
 using LitJson;
 using System;
 using System.Collections;
 using System.Text;
+using System.Text.RegularExpressions;
 using UnityEngine;
 using UnityEngine.Networking;
-using DongWuYiXue.Main;
 
 public class ChatZxkAI : LLM
 {
@@ -77,8 +78,10 @@ public class ChatZxkAI : LLM
                 string _msg = currentRequest.downloadHandler.text;
                 Debug.Log(_msg);
                 JsonData responseBody = JsonMapper.ToObject(_msg);
-                Debug.Log(responseBody["choices"][0]["message"]["content"].ToString() + "\nAI-耗时" + stopwatch.Elapsed.TotalSeconds);
-                assistant = responseBody["choices"][0]["message"]["content"].ToString();
+                //Debug.Log(responseBody["choices"][0]["message"]["content"].ToString() + "\nAI-耗时" + stopwatch.Elapsed.TotalSeconds);
+                Debug.Log(Regex.Replace(responseBody["choices"][0]["message"]["content"].ToString(), @"\[.*?\]", "") + "\nAI-耗时" + stopwatch.Elapsed.TotalSeconds);
+                //assistant = responseBody["choices"][0]["message"]["content"].ToString();
+                assistant = Regex.Replace(responseBody["choices"][0]["message"]["content"].ToString(), @"\[.*?\]", "");
                 //回调
                 _callback?.Invoke(responseBody["choices"][0]["message"]["content"].ToString());
                 success = true;
diff --git a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/LianJieJiNiaoDaiState.cs b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/LianJieJiNiaoDaiState.cs
index 8109abf..4d57b80 100644
--- a/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/LianJieJiNiaoDaiState.cs
+++ b/Assets/_Scripts/Application/daoNiaoShu/FSMManager/State/LianJieJiNiaoDaiState.cs
@@ -26,17 +26,17 @@ namespace DongWuYiXue.DaoNiaoShu
             GameManager.Instance.webSockerCameraSender.OnMessageReceived.AddListener(Test);
             GameManager.Instance.videoUI.SetActive(true);
 
-            cor = Game.Instance.IEnumeratorManager.Run(5.0f, () =>
+            cor = Game.Instance.IEnumeratorManager.Run(2.0f, () =>
             {
                 isLianJie = true;
-                if (fsm.main_gameModel.modeType == ModeType.ShiXun)
-                {
-                    fsm.AddScore(2, 0);
-                }
-                if (fsm.main_gameModel.modeType == ModeType.KaoHe)
-                {
-                    fsm.AddScore(2, 0);
-                }
+                //if (fsm.main_gameModel.modeType == ModeType.ShiXun)
+                //{
+                //    fsm.AddScore(2, 0);
+                //}
+                //if (fsm.main_gameModel.modeType == ModeType.KaoHe)
+                //{
+                //    fsm.AddScore(2, 0);
+                //}
             });
         }