修改生成线缆高度

This commit is contained in:
高国正 2025-01-08 09:03:46 +08:00
parent f8beaf313b
commit 799b192953
5 changed files with 286 additions and 30 deletions

View File

@ -26233,12 +26233,6 @@ MonoBehaviour:
m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3} m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
targetCamera: {fileID: 0}
distanceMultiplier: 0.05
canvas: {fileID: 0}
initialScale: {x: 0, y: 0, z: 0}
button: {fileID: 0}
text: {fileID: 0}
--- !u!1 &510495731 --- !u!1 &510495731
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -49868,12 +49862,6 @@ MonoBehaviour:
m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3} m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
targetCamera: {fileID: 0}
distanceMultiplier: 0.05
canvas: {fileID: 0}
initialScale: {x: 0, y: 0, z: 0}
button: {fileID: 0}
text: {fileID: 0}
--- !u!1 &971395179 --- !u!1 &971395179
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -50371,12 +50359,6 @@ MonoBehaviour:
m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3} m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
targetCamera: {fileID: 0}
distanceMultiplier: 0.05
canvas: {fileID: 0}
initialScale: {x: 0, y: 0, z: 0}
button: {fileID: 0}
text: {fileID: 0}
--- !u!1 &979444513 --- !u!1 &979444513
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -112003,6 +111985,121 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 2867121862218958565} m_PrefabInstance: {fileID: 2867121862218958565}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &1064583388597519580
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1064583388597519574}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
m_Name:
m_EditorClassIdentifier:
conf2:
isUse: 0
module_type: 0
type_card: 0
isUseUPostItem: 1
deviceList:
id:
deviceName:
deviceCode:
type:
typeStr:
deviceType:
deviceTypeStr:
rackId:
shelfId:
slotId:
devicePosition:
machineModel:
status:
conDeviceName:
rackType:
openFlag:
backDoorFlag:
modelNum:
occupyNum:
residueNum:
operationTime:
directorName:
phone:
manufacturer:
powerProperties:
maintenanceUnit:
machineFrameHigh:
machineFrameWide:
machineFrameThick:
slotNum:
slotSort:
installMethod:
affiliationFrame:
parentSlotName:
slotType:
occupyStatus:
affiliationSlot:
portNum:
cardFunction:
cardType:
runStatus:
tmsId:
remark:
deviceTypeCode:
functionDescription:
createTime:
createName:
networkLevel:
hight: {fileID: 0}
--- !u!114 &1064583388597519581
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1064583388597519574}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a9e9378d29a846248a3070aaae297185, type: 3}
m_Name:
m_EditorClassIdentifier:
eNVList_W:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
eNVList_S:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
eNVList_Y:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
eNVList_J:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
--- !u!114 &1068110829461994726 --- !u!114 &1068110829461994726
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -124478,7 +124575,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -63.999878, y: 487} m_AnchoredPosition: {x: -63.999756, y: 487}
m_SizeDelta: {x: -1303.1125, y: -1040} m_SizeDelta: {x: -1303.1125, y: -1040}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1332666221677478668 --- !u!114 &1332666221677478668
@ -150948,7 +151045,7 @@ PrefabInstance:
- target: {fileID: 1907843774066353948, guid: f12e732b7b6c24e489ac02c8af4e7a78, - target: {fileID: 1907843774066353948, guid: f12e732b7b6c24e489ac02c8af4e7a78,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.00005074135 value: 0.0002884762
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1907843774098386396, guid: f12e732b7b6c24e489ac02c8af4e7a78, - target: {fileID: 1907843774098386396, guid: f12e732b7b6c24e489ac02c8af4e7a78,
type: 3} type: 3}
@ -197435,6 +197532,121 @@ GameObject:
type: 3} type: 3}
m_PrefabInstance: {fileID: 2867121862218958565} m_PrefabInstance: {fileID: 2867121862218958565}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!114 &5022066451324198524
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5022066451324198518}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3}
m_Name:
m_EditorClassIdentifier:
conf2:
isUse: 0
module_type: 0
type_card: 0
isUseUPostItem: 1
deviceList:
id:
deviceName:
deviceCode:
type:
typeStr:
deviceType:
deviceTypeStr:
rackId:
shelfId:
slotId:
devicePosition:
machineModel:
status:
conDeviceName:
rackType:
openFlag:
backDoorFlag:
modelNum:
occupyNum:
residueNum:
operationTime:
directorName:
phone:
manufacturer:
powerProperties:
maintenanceUnit:
machineFrameHigh:
machineFrameWide:
machineFrameThick:
slotNum:
slotSort:
installMethod:
affiliationFrame:
parentSlotName:
slotType:
occupyStatus:
affiliationSlot:
portNum:
cardFunction:
cardType:
runStatus:
tmsId:
remark:
deviceTypeCode:
functionDescription:
createTime:
createName:
networkLevel:
hight: {fileID: 0}
--- !u!114 &5022066451324198525
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5022066451324198518}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a9e9378d29a846248a3070aaae297185, type: 3}
m_Name:
m_EditorClassIdentifier:
eNVList_W:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
eNVList_S:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
eNVList_Y:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
eNVList_J:
pointId:
pointDeviceId:
pointName:
pointType:
pointStatus:
collectDate:
collectResult:
rackId:
--- !u!1 &5022954653524497893 --- !u!1 &5022954653524497893
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -115,6 +115,10 @@ public class LineGroupItem : MonoBehaviour
} }
LineObjectPool.Instance.PushItemToPool(this); LineObjectPool.Instance.PushItemToPool(this);
} }
else
{
Debug.LogError("删除线缆组失败:" + x);
}
})); }));
} }
else else

View File

@ -6,7 +6,7 @@
"heatThresholdValueMin": "5", "heatThresholdValueMin": "5",
"humidityThresholdValueMax": "20", "humidityThresholdValueMax": "20",
"humidityThresholdValueMin": "80", "humidityThresholdValueMin": "80",
"token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzU5MDcyNjIsInVzZXJuYW1lIjoiYWRtaW4ifQ.cXS9OLTjefc32SA4P4nRnoH9vrR7GRMm9scBaPaYKxg" "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzYzMjc4NzIsInVzZXJuYW1lIjoiYWRtaW4ifQ.g7GbqWmwv0Fct3QhwMOIZtfDo8brbxkApWVnzLlrKJY"
}, },
"serverTime": "1715417370490" "serverTime": "1715417370490"
} }

View File

@ -122,6 +122,43 @@ public class WebInteraction : MonoBehaviour
Debug.Log("获取地址错误!"); Debug.Log("获取地址错误!");
} }
})); }));
#elif UNITY_WEBGL
//// 在编辑器中运行时执行的代码
//StartCoroutine(LoadAddress((ct) =>
//{
// if (ct != null)
// {
// unity_token_value(ct);
// }
// else
// {
// Debug.Log("获取地址错误!");
// }
//}));
//// 在编辑器中运行时执行的代码
//StartCoroutine(Inspection((ct) =>
//{
// if (ct != null)
// {
// unity_Inspection_value(ct);
// }
// else
// {
// Debug.Log("获取地址错误!");
// }
//}));
//// 在编辑器中运行时执行的代码
//StartCoroutine(Track((ct) =>
//{
// if (ct != null)
// {
// robotPos = JsonConvert.DeserializeObject<List<RobotPos>>(ct);
// }
// else
// {
// Debug.Log("获取地址错误!");
// }
//}));
#endif #endif
//StartCoroutine(QiangZhi()); //StartCoroutine(QiangZhi());
} }
@ -138,7 +175,8 @@ public class WebInteraction : MonoBehaviour
unity_power_value(s); unity_power_value(s);
}); });
//Debug.Log("版本号 1.1.1"); //Debug.Log("版本号 1.1.1");
btnRobotWebPage.onClick.AddListener(() => { btnRobotWebPage.onClick.AddListener(() =>
{
OpenRobotWebPage(); OpenRobotWebPage();
}); });
} }
@ -232,7 +270,7 @@ public class WebInteraction : MonoBehaviour
} }
catch (Exception e) catch (Exception e)
{ {
Debug.Log("序列化-循环环境查询错误:" + e.Message); Debug.Log("序列化-循环环境查询错误:" + e.Message + "\n" + e.StackTrace);
} }
} }
})); }));

View File

@ -819,11 +819,13 @@ public class CreateLine : CabinetUIBase
int cjB = GameManager.Inst.CengJi((go2.GetComponent<DeviceQuery>().deviceList.devicePosition).Split('-')[0]); int cjB = GameManager.Inst.CengJi((go2.GetComponent<DeviceQuery>().deviceList.devicePosition).Split('-')[0]);
if (cjA == cjB) if (cjA == cjB)
{ {
Creat5(list7[i - 1], list7[i], cjB); //Creat5(list7[i - 1], list7[i], cjB);
Creat5(list7[i - 1], list7[i], 6);
} }
else else
{ {
Creat7(list7[i - 1], list7[i], cjB); //Creat7(list7[i - 1], list7[i], cjB);
Creat7(list7[i - 1], list7[i], 6);
} }
} }
catch (Exception e) catch (Exception e)