DongWuYiXue/DaoNiaoShu_Dog
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据产品修改意见最新修改

Browse Source
This commit is contained in:
高铎 2026-01-05 15:07:41 +08:00
parent c5574a995b
commit d89753ef03
7 changed files with 63 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Assets/Art/Sprites/书籍优化/Back.prefab
View File

@ -127,8 +127,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 30, y: -84}
m_SizeDelta: {x: -29.999998, y: 830}
m_AnchoredPosition: {x: 30, y: -70}
m_SizeDelta: {x: -30, y: 480}
m_Pivot: {x: 0, y: 1}
--- !u!222 &579047698137250596
CanvasRenderer:
@ -160,7 +160,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: be667217d3d3a5447a0231196de062c0, type: 3}
m_FontSize: 25
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
@ -315,7 +315,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.000030517578, y: 10}
m_AnchoredPosition: {x: 0, y: 10}
m_SizeDelta: {x: -40.000015, y: -60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4538426996848575638
@ -368,7 +368,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 522482546413498521}
m_Content: {fileID: 0}
m_Horizontal: 0
m_Vertical: 0
m_MovementType: 1
@ -421,8 +421,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 23.4512, y: 0}
m_SizeDelta: {x: 61.0977, y: 40}
m_AnchoredPosition: {x: 15.8488, y: 1.4819}
m_SizeDelta: {x: 40.3033, y: 38.8674}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1119868347875695608
CanvasRenderer:

12
Assets/Art/Sprites/书籍优化/Front.prefab
View File

@ -296,8 +296,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 30, y: -84}
m_SizeDelta: {x: -30, y: 830}
m_AnchoredPosition: {x: 30, y: -70}
m_SizeDelta: {x: -30, y: 480}
m_Pivot: {x: 0, y: 1}
--- !u!222 &3272867475693095438
CanvasRenderer:
@ -329,7 +329,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: be667217d3d3a5447a0231196de062c0, type: 3}
m_FontSize: 25
m_FontSize: 24
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
@ -688,7 +688,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Content: {fileID: 3635586649588463893}
m_Content: {fileID: 0}
m_Horizontal: 0
m_Vertical: 0
m_MovementType: 1
@ -818,8 +818,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -24.528809, y: 0}
m_SizeDelta: {x: 58.9424, y: 40}
m_AnchoredPosition: {x: -15.529, y: 1.4819}
m_SizeDelta: {x: 40.942, y: 38.8674}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8884188765733387939
CanvasRenderer:

3
Assets/SenSorSystem/MianQian_SenSor.cs
View File

@ -1,6 +1,7 @@
using DongWuYiXue.DaoNiaoShu;
using System.Collections;
using System.Collections.Generic;
using System.IO.Ports;
using UnityEngine;
using UnityEngine.UI;
@ -35,7 +36,7 @@ public class MianQian_SenSor : Sensor
GameManager.Instance.senSor.SendFunction("+++");
}
public override void ReceiveData(string datas)
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;

13
Assets/SensorModule/Scripts/SensorManager.cs
View File

@ -235,7 +235,6 @@ public class SensorManager : MonoBehaviour /*MonoSingleton<SensorManager>*/
#endregion
private Dictionary<string, Sensor> allSensor = new Dictionary<string, Sensor>();
public GameObject canvas;
List<string> COMPorts = new List<string>();
List<SerialPort> serialPorts = new List<SerialPort>();
List<Thread> dataReceiveThreads = new List<Thread>();
@ -290,18 +289,6 @@ public class SensorManager : MonoBehaviour /*MonoSingleton<SensorManager>*/
OpenPort();
}
private void Update()
{
if (Input.GetKeyDown(KeyCode.BackQuote))
{
canvas?.SetActive(!canvas.activeInHierarchy);
}
if (Input.GetKeyDown(KeyCode.Escape))
{
canvas?.SetActive(false);
}
}
/// <summary>
/// 俚쌘직쌈澗窟넋（곬땍야竟눔왯乞多）
/// </summary>

24
Assets/_Scenes/daoNiaoShu.unity
View File

@ -66094,7 +66094,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 960, y: -85}
m_AnchoredPosition: {x: 1600, y: -85}
m_SizeDelta: {x: 620, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &620443684
@ -330221,9 +330221,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6c58763dd2491d94c882310d382a6dfc, type: 3}
m_Name:
m_EditorClassIdentifier:
portName: COM13
baudRate: 115200
dataType: 1
canvas: {fileID: 6827219334165435743}
--- !u!114 &6827219332398779375
MonoBehaviour:
m_ObjectHideFlags: 0
@ -345595,21 +345595,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9084052908221352835}
m_CullTransparentMesh: 1
--- !u!114 &9084052908321516352
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9084052908321516358}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6515ceb79208d2043abd8b8ae96b2915, type: 3}
m_Name:
m_EditorClassIdentifier:
progressValue: 0
txt: {fileID: 0}
isOpen: 0
--- !u!114 &9084052908321516353
MonoBehaviour:
m_ObjectHideFlags: 0
@ -345686,7 +345671,6 @@ GameObject:
- component: {fileID: 9084052908321516355}
- component: {fileID: 9084052908321516354}
- component: {fileID: 9084052908321516353}
- component: {fileID: 9084052908321516352}
m_Layer: 5
m_Name: "20ml\u6CE8\u5C04\u5668UI"
m_TagString: Untagged
@ -345712,7 +345696,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 1600, y: -85}
m_AnchoredPosition: {x: 320, y: -85}
m_SizeDelta: {x: 620, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &9084052908359777077
@ -345875,7 +345859,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 320, y: -85}
m_AnchoredPosition: {x: 960, y: -85}
m_SizeDelta: {x: 620, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &9084052908428991603

54
Assets/_Scripts/Application/daoNiaoShu/UI/ChengJiPanel.cs
View File

@ -14,6 +14,7 @@ namespace DongWuYiXue.DaoNiaoShu
CanvasRadarChart radar;
//GameObject aiSpeak;
//Text aiText;
int numID;
public override string GroupName => "ChengJiPanel";
public override string Name => "ChengJiPanel";
public override void Init(IUIManager uictrl)
@ -35,18 +36,51 @@ namespace DongWuYiXue.DaoNiaoShu
}
public void GeneSteps(List<Step> steps)
{
for (int i = 0; i < steps.Count; i++)
numID = 0;
List<BaseData> listBaseData = GetModel<GameModel>().excelData.allBaseData;
for (int i = 0; i < listBaseData.Count; i++)
{
int seq = i + 1;
Step s = steps[i];
GameObject obj = Instantiate(step, content);
obj.SetActive(true);
obj.transform.FindFirst<Text>("ID").text = seq.ToString();
obj.transform.FindFirst<Text>("Name").text = s.stepName;
obj.transform.FindFirst<Text>("Type").text = s.stepType;
obj.transform.FindFirst<Text>("MaxScore").text = s.maxScore;
obj.transform.FindFirst<Text>("Score").text = s.score.ToString();
numID++;
Step st = steps.Find(e => e.parentName == listBaseData[i].parentName && e.stepName == listBaseData[i].name);
if (st != null)
{
//Step s = steps[i];
GameObject obj = Instantiate(step, content);
obj.SetActive(true);
obj.transform.FindFirst<Text>("ID").text = numID.ToString();
obj.transform.FindFirst<Text>("Name").text = st.stepName;
obj.transform.FindFirst<Text>("Type").text = st.stepType;
obj.transform.FindFirst<Text>("MaxScore").text = st.maxScore;
obj.transform.FindFirst<Text>("Score").text = st.score.ToString();
}
else
{
if (!string.IsNullOrEmpty(listBaseData[i].score_sx))
{
GameObject obj = Instantiate(step, content);
obj.SetActive(true);
obj.transform.FindFirst<Text>("ID").text = numID.ToString();
obj.transform.FindFirst<Text>("Name").text = listBaseData[i].name;
obj.transform.FindFirst<Text>("Type").text = listBaseData[i].type;
obj.transform.FindFirst<Text>("MaxScore").text = listBaseData[i].score_sx;
obj.transform.FindFirst<Text>("Score").text = "¡ª¡ª";
}
}
}
//for (int i = 0; i < steps.Count; i++)
//{
// int seq = i + 1;
// Step s = steps[i];
// GameObject obj = Instantiate(step, content);
// obj.SetActive(true);
// obj.transform.FindFirst<Text>("ID").text = seq.ToString();
// obj.transform.FindFirst<Text>("Name").text = s.stepName;
// obj.transform.FindFirst<Text>("Type").text = s.stepType;
// obj.transform.FindFirst<Text>("MaxScore").text = s.maxScore;
// obj.transform.FindFirst<Text>("Score").text = s.score.ToString();
//}
}
public void SetRadar()
{

BIN
msc/069ff7edfa99257b1e2ff25853437b0e/kivw.dat
View File

Binary file not shown.