This commit is contained in:
yulong 2024-10-18 14:44:27 +08:00
parent b9676adc29
commit 3d42cbc87e
13 changed files with 3284 additions and 1233 deletions

View File

@ -88,6 +88,7 @@ namespace Cysharp.Threading.Tasks
break;
case UnityEngine.LogType.Exception:
UnityEngine.Debug.LogException(ex);
break;
default:
break;

View File

@ -75,6 +75,85 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &349334964500156418
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4020425973822135105}
- component: {fileID: 8343764480260372525}
- component: {fileID: 267905114987982700}
m_Layer: 5
m_Name: Empty
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4020425973822135105
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 349334964500156418}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3858578982098949233}
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: 0, y: 20.8}
m_SizeDelta: {x: 160, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8343764480260372525
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 349334964500156418}
m_CullTransparentMesh: 1
--- !u!114 &267905114987982700
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 349334964500156418}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.1764706, g: 0.8, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: f32bbac604d703d409a47ac9ecee2cd2, type: 3}
m_FontSize: 16
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text:
--- !u!1 &360483159125642966
GameObject:
m_ObjectHideFlags: 0
@ -153,7 +232,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: YZP2303017
m_Text:
--- !u!1 &390594060141078941
GameObject:
m_ObjectHideFlags: 0
@ -463,7 +542,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 200305
m_Text:
--- !u!1 &872995992754669897
GameObject:
m_ObjectHideFlags: 0
@ -496,6 +575,7 @@ RectTransform:
m_Children:
- {fileID: 9204169222973429289}
- {fileID: 2906175532453748179}
- {fileID: 4020425973822135105}
m_Father: {fileID: 7507838588813319936}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
@ -762,7 +842,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_Font: {fileID: 12800000, guid: f32bbac604d703d409a47ac9ecee2cd2, type: 3}
m_FontSize: 16
m_FontStyle: 0
m_BestFit: 0
@ -853,7 +933,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 200552
m_Text:
--- !u!1 &1868617540403583761
GameObject:
m_ObjectHideFlags: 0
@ -1288,7 +1368,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 157.75Kg
m_Text:
--- !u!1 &3799521104188906949
GameObject:
m_ObjectHideFlags: 0
@ -1446,7 +1526,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u5170\u5DDE(\u786C\u73CD\u54C1)\u70DF\u4E1D"
m_Text:
--- !u!1 &4425513612645628255
GameObject:
m_ObjectHideFlags: 0
@ -1525,7 +1605,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 17.75Kg
m_Text:
--- !u!1 &4518881432310018488
GameObject:
m_ObjectHideFlags: 0
@ -2378,6 +2458,7 @@ MonoBehaviour:
Upweighttext: {fileID: 1664210978942925864}
Downcasenumber: {fileID: 7148088327476924386}
Downweighttext: {fileID: 2260424026103117257}
Emptytext: {fileID: 267905114987982700}
--- !u!114 &5593738242948707193
MonoBehaviour:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -9,7 +9,7 @@ public class Activatetest : MonoBehaviour
private float speed = 3f;
async void Start()
{
await Movecar();
//await Movecar();
}
public async UniTask Movecar()

View File

@ -1,6 +1,7 @@
using System.Collections;
using System.IO;
using System.Net;
using Unity.VisualScripting.FullSerializer;
using UnityEngine;
using UnityEngine.Networking;
@ -28,7 +29,7 @@ public class AddConfing : MonoBehaviour
{
string filePath = Path.Combine(Application.streamingAssetsPath, "IPPort.txt");
UnityWebRequest request = UnityWebRequest.Get(filePath);
request.SetRequestHeader("Cache-Control", "no-cache");//ÉèÖÃÎÞ»º´æ
yield return request.SendWebRequest();
if (request.result == UnityWebRequest.Result.ConnectionError || request.result == UnityWebRequest.Result.ProtocolError)
@ -41,7 +42,7 @@ public class AddConfing : MonoBehaviour
string[] datas = str.Split(":");
IP = datas[0];
Port = datas[1];
//Debug.Log(IP + " " + Port);
Debug.Log(IP + " " + Port);
}

View File

@ -13,6 +13,7 @@ public class Boxdatapanel : MonoBehaviour
/// 箱子位置时间名称编号重量信息
/// </summary>
public Text Positiontext, Datetext, Cigarettename, lotnumber, Upcasenumber, Upweighttext, Downcasenumber, Downweighttext;
public Text Emptytext;
/// <summary>
/// 获取箱子上面信息
/// </summary>
@ -33,6 +34,11 @@ public class Boxdatapanel : MonoBehaviour
Downcasenumber.text = casen;
Downweighttext.text = downeight;
}
public void Emptydata(string empty)
{
Emptytext.text = empty;
}
/// <summary>
/// 叉掉返回接口
/// </summary>

View File

@ -16,14 +16,14 @@ public class Deliveryfromstorage : MonoBehaviour
async void Start()
{
car = GameObject.Find("4-1-2");
//car = GameObject.Find("4-1-2");
car1 = GameObject.Find("14-37-2");
tarton = car1.GetComponent<Transform>();
//car1 = GameObject.Find("14-37-2");
//tarton = car1.GetComponent<Transform>();
await Planneddisplacement();
//await Planneddisplacement();
}
private async UniTask Planneddisplacement()

View File

@ -23,13 +23,15 @@ public class Fetchbox : MonoBehaviour
/// 每个箱子的信息
/// </summary>
public List<Boxinformation> boxinformationList = new List<Boxinformation>();
private void Awake()
private void Start()
{
url += Boxface;
StartCoroutine(Getstring(url, (data) =>
{
//Debug.Log(data);
Boxdata(data);
Debug.Log("调用l");
}));
}
/// <summary>
@ -39,6 +41,7 @@ public class Fetchbox : MonoBehaviour
{
if (data != null)
{
Debug.Log(data);
shelfBoxModel = JsonUtility.FromJson<ShelfBoxModel>(data);
for (int i = 0; i < shelfBoxModel.result.Count; i++)
{
@ -84,7 +87,8 @@ public class Fetchbox : MonoBehaviour
}
else
{
Destroy(Box);
//Destroy(Box);
Debug.LogWarning($"未找到名为 {boxname} 的父对象。物体将被删除。");
}
}

View File

@ -111,64 +111,73 @@ public class Interaction : MonoBehaviour
Debug.Log(gameObject.tag);
if (hit.collider.CompareTag("Car"))
{
Carinformation carinformation = hit.collider.gameObject.GetComponent<Carinformation>();
//Debug.Log(carinformation.ID);
string url = Carinterface + carinformation.ID;
StartCoroutine(Post1(url, (data) =>
{
UIDeviceBaseInfoPanel.gameObject.SetActive(true);
// Debug.Log(data);
Cardata cardata = JsonUtility.FromJson<Cardata>(data);
UIDeviceBaseInfoPanel.Getdata(cardata.type, cardata.time, cardata.result.id, cardata.result.boxCode, cardata.result.car_Layer, cardata.result.car_X, cardata.result.car_Y,
cardata.result.carPLT, cardata.result.error1, cardata.result.error2, cardata.result.error3, cardata.result.error4, cardata.result.error5, "²ÎÊý²»¹»", () =>
{
//Carinformation carinformation = hit.collider.gameObject.GetComponent<Carinformation>();
////Debug.Log(carinformation.ID);
//string url = Carinterface + carinformation.ID;
//StartCoroutine(Post1(url, (data) =>
//{
// UIDeviceBaseInfoPanel.gameObject.SetActive(true);
// // Debug.Log(data);
// Cardata cardata = JsonUtility.FromJson<Cardata>(data);
// UIDeviceBaseInfoPanel.Getdata(cardata.type, cardata.time, cardata.result.id, cardata.result.boxCode, cardata.result.car_Layer, cardata.result.car_X, cardata.result.car_Y,
// cardata.result.carPLT, cardata.result.error1, cardata.result.error2, cardata.result.error3, cardata.result.error4, cardata.result.error5, "²ÎÊý²»¹»", () =>
// {
UIDeviceBaseInfoPanel.gameObject.SetActive(false);
});
// UIDeviceBaseInfoPanel.gameObject.SetActive(false);
// });
}));
//}));
}
if (hit.collider.CompareTag("Box"))
{
Boxinformation boxinformation = hit.collider.gameObject.GetComponent<Boxinformation>();
//Debug.Log(boxinformation.locationId);
string url = Boxinformationface + boxinformation.locationId;
StartCoroutine(Post1(url, (data) =>
Debug.Log(gameObject.name);
if (hit.collider.gameObject.GetComponent<Boxinformation>())
{
Debug.Log(data);
Cigaretteinformation cigaretteinformation = JsonUtility.FromJson<Cigaretteinformation>(data);
// Debug.Log(cigaretteinformation.time);
for (int i = 0; i < cigaretteinformation.result.Count; i++)
Boxinformation boxinformation = hit.collider.gameObject.GetComponent<Boxinformation>();
if (boxinformation.itemType == "EmptyBox")
{
if (cigaretteinformation.result[i].lineNum.Equals(10))
{
UIBoxdatapanel.Getdata(cigaretteinformation.result[i].itemDesc, cigaretteinformation.result[i].batch, cigaretteinformation.result[i].palletNum, cigaretteinformation.result[i].weight + "Kg");
};
if (cigaretteinformation.result[i].lineNum.Equals(20))
{
UIBoxdatapanel.GetDragdown(cigaretteinformation.result[i].palletNum, cigaretteinformation.result[i].weight + "Kg");
}
UIBoxdatapanel.Emptydata("¿ÕÏä×Ó");
}
UIBoxdatapanel.Getoff(() =>
//Debug.Log(boxinformation.locationId);
string url = Boxinformationface + boxinformation.locationId;
StartCoroutine(Post1(url, (data) =>
{
UIBoxdatapanel.gameObject.SetActive(false);
});
UIBoxdatapanel.gameObject.SetActive(true);
}));
Debug.Log(data);
Cigaretteinformation cigaretteinformation = JsonUtility.FromJson<Cigaretteinformation>(data);
// Debug.Log(cigaretteinformation.time);
for (int i = 0; i < cigaretteinformation.result.Count; i++)
{
if (cigaretteinformation.result[i].lineNum.Equals(10))
{
UIBoxdatapanel.Getdata(cigaretteinformation.result[i].itemDesc, cigaretteinformation.result[i].batch, cigaretteinformation.result[i].palletNum, cigaretteinformation.result[i].weight);
};
if (cigaretteinformation.result[i].lineNum.Equals(20))
{
UIBoxdatapanel.GetDragdown(cigaretteinformation.result[i].palletNum, cigaretteinformation.result[i].weight);
}
}
UIBoxdatapanel.Getoff(() =>
{
UIBoxdatapanel.gameObject.SetActive(false);
});
UIBoxdatapanel.gameObject.SetActive(true);
}));
}
}
if (hit.collider.CompareTag("Hoister"))
{
Debug.Log(gameObject.name);
Consentmark hoistinformation = hit.collider.gameObject.GetComponent<Consentmark>();
// Debug.Log(hoistinformation.ID);
// Debug.Log(hoistinformation.ID);
string url = Hoisinterface + hoistinformation.ID;
// Debug.Log(url);
// Debug.Log(url);
StartCoroutine(Post1(url, (data) =>
{
//Debug.Log(data);
Elevatorpopup elevatdata = JsonUtility.FromJson<Elevatorpopup>(data);
// Debug.Log(elevatdata.result.lowerDecelerationInspection);
// Debug.Log(elevatdata.result.lowerDecelerationInspection);
UIHoister.Gethoister(elevatdata.result.taskNumber, elevatdata.result.currentLayer, elevatdata.result.targetLayer, elevatdata.result.startingLayer,
elevatdata.result.workingStatus, elevatdata.result.lowerBoxNumber, elevatdata.result.descent, elevatdata.result.forwardCargoInspection, elevatdata.result.downInPlaceInspection,
elevatdata.result.upperInPlaceInspection, elevatdata.result.overboundaryInspection1, elevatdata.result.overboundaryInspection2, elevatdata.result.upperlimitInspection,
@ -183,15 +192,16 @@ public class Interaction : MonoBehaviour
}
if (hit.collider.CompareTag("Palletizer"))
{
Debug.Log(gameObject.name);
Consentmark palletizerparameters = hit.collider.gameObject.GetComponent<Consentmark>();
// Debug.Log(palletizerparameters.ID);
// Debug.Log(palletizerparameters.ID);
string url = Palletizerface + palletizerparameters.ID;
//Debug.Log(url);
StartCoroutine(Post1(url, (data) =>
{
//Debug.Log(data);
PalletizerMessage palletizer = JsonUtility.FromJson<PalletizerMessage>(data);
// Debug.Log(palletizer.result.id);
// Debug.Log(palletizer.result.id);
UIPalletizer.Getpalletizer(palletizer.result.boxesNumber, palletizer.result.leftExtensionForkPositionInspection, palletizer.result.rightExtensionForkPositionInspection,
palletizer.result.upperInPlace, palletizer.result.downInPlace, palletizer.result.leftRetractionForkPositionInspection, palletizer.result.rightRetractionForkPositionInspection,
palletizer.result.forkExtensionInPlace, palletizer.result.forkRetractionInPlace, palletizer.result.forkCargoInspection, palletizer.result.superelevationFault,
@ -206,10 +216,11 @@ public class Interaction : MonoBehaviour
}
if (hit.collider.CompareTag("Battery"))
{
Debug.Log(gameObject.name);
Consentmark batterychanger = hit.collider.gameObject.GetComponent<Consentmark>();
//Debug.Log(batterychanger.ID);
string url = Batteryface + batterychanger.ID;
// Debug.Log(url);
// Debug.Log(url);
StartCoroutine(Post1(url, (data) =>
{
//Debug.Log(data);
@ -227,10 +238,11 @@ public class Interaction : MonoBehaviour
}
if (hit.collider.CompareTag("Outofthe"))
{
Debug.Log(gameObject.name);
Consentmark outofthe = hit.collider.GetComponent<Consentmark>();
// Debug.Log(outofthe.ID);
// Debug.Log(outofthe.ID);
string url = Outoftheface + outofthe.ID;
// Debug.Log(url);
// Debug.Log(url);
StartCoroutine(Post1(url, (data) =>
{
Debug.Log(data);
@ -248,13 +260,14 @@ public class Interaction : MonoBehaviour
}
if (hit.collider.CompareTag("Intothe"))
{
Debug.Log(gameObject.name);
Consentmark intothes = hit.collider.GetComponent<Consentmark>();
// Debug.Log(intothes.ID);
// Debug.Log(intothes.ID);
string url = Intotheface + intothes.ID;
// Debug.Log(url);
// Debug.Log(url);
StartCoroutine(Post1(url, (data) =>
{
// Debug.Log(data);
// Debug.Log(data);
Conveyors intothe = JsonUtility.FromJson<Conveyors>(data);
//Debug.Log(intothe.result.id);
UIConveyorpanel.Getconvey(intothe.result.taskNumber, intothe.result.upperBoxNumber, intothe.result.startingAddress, intothe.result.upperBoxTobaccoWeight, intothe.result.destinationAddress, intothe.result.lowerBoxNumber,
@ -269,6 +282,7 @@ public class Interaction : MonoBehaviour
}
if (hit.collider.CompareTag("floortype"))
{
Debug.Log(gameObject.name);
Consentmark floor = hit.collider.gameObject.GetComponent<Consentmark>();
//Debug.Log(floor.ID);
string url = Floorface + floor.ID;
@ -291,15 +305,16 @@ public class Interaction : MonoBehaviour
}
if (hit.collider.CompareTag("decap"))
{
Debug.Log(gameObject.name);
Consentmark decaps = hit.collider.gameObject.GetComponent<Consentmark>();
//Debug.Log(decaps.ID);
string url = Decapface + decaps.ID;
// Debug.Log(url);
Debug.Log(url);
StartCoroutine(Post1(url, (data) =>
{
//Debug.Log(data);
Decappingmachine decappingmachine = JsonUtility.FromJson<Decappingmachine>(data);
// Debug.Log(decappingmachine.result.id);
// Debug.Log(decappingmachine.result.id);
UICoverremovalmachine.Getdecap(decappingmachine.result.caseLidStatus, decappingmachine.result.frontInPlaceInspection, decappingmachine.result.rearInPlaceInspection, decappingmachine.result.frontDecelerationInspection,
decappingmachine.result.rearDecelerationInspection, decappingmachine.result.frontLimitInspection, decappingmachine.result.rearLimitInspection, decappingmachine.result.no1CylinderUpperPositionInspection,
decappingmachine.result.no1CylinderLowerPositionInspection, decappingmachine.result.no2CylinderUpperPositionInspection, decappingmachine.result.no2CylinderLowerPositionInspection, decappingmachine.result.no3CylinderUpperPositionInspection,

View File

@ -6,7 +6,7 @@ using UnityEngine.Networking;
public static class InterfaceManager
{
private static string _IP = "172.16.1.104";
private static string _IP = "10.155.161.49";
public static string IP
{
get { return _IP; }
@ -18,7 +18,7 @@ public static class InterfaceManager
}
}
}
private static string _Port = "5005";
private static string _Port = "8083";
public static string Port
{
get { return _Port; }

View File

@ -17,14 +17,14 @@ public class Movetest : MonoBehaviour
void Start()
{
car = GameObject.Find("4-1-2");
//car = GameObject.Find("4-1-2");
car1 = GameObject.Find("14-37-2");
tarton = car1.GetComponent<Transform>();
boxcollider = transform.GetComponent<BoxCollider>();
//car1 = GameObject.Find("14-37-2");
//tarton = car1.GetComponent<Transform>();
//boxcollider = transform.GetComponent<BoxCollider>();
_ = Planneddisplacement();
//_ = Planneddisplacement();
}
private async UniTask Planneddisplacement()

View File

@ -9,7 +9,7 @@ public class Powerreplacement : MonoBehaviour
public float speed = 5f;//小车移动
async void Start()
{
await Movecar();
//await Movecar();
}
void Update()
{

View File

@ -12,7 +12,7 @@ public class Shippingoffthebox : MonoBehaviour
private float speed = 5f;
async void Start()
{
await Displacement();
//await Displacement();
}
private async UniTask Displacement()