diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity index 90f1fb778..553119128 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity @@ -26233,12 +26233,6 @@ MonoBehaviour: m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3} m_Name: 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 GameObject: m_ObjectHideFlags: 0 @@ -49868,12 +49862,6 @@ MonoBehaviour: m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3} m_Name: 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 GameObject: m_ObjectHideFlags: 0 @@ -50371,12 +50359,6 @@ MonoBehaviour: m_Script: {fileID: -494081480, guid: 3a9d3f7be36426143afceebeda50a49d, type: 3} m_Name: 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 GameObject: m_ObjectHideFlags: 0 @@ -112003,6 +111985,121 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2867121862218958565} 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 MonoBehaviour: m_ObjectHideFlags: 0 @@ -124478,7 +124575,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: -63.999878, y: 487} + m_AnchoredPosition: {x: -63.999756, y: 487} m_SizeDelta: {x: -1303.1125, y: -1040} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1332666221677478668 @@ -150948,7 +151045,7 @@ PrefabInstance: - target: {fileID: 1907843774066353948, guid: f12e732b7b6c24e489ac02c8af4e7a78, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.00005074135 + value: 0.0002884762 objectReference: {fileID: 0} - target: {fileID: 1907843774098386396, guid: f12e732b7b6c24e489ac02c8af4e7a78, type: 3} @@ -197435,6 +197532,121 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 2867121862218958565} 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 GameObject: m_ObjectHideFlags: 0 diff --git a/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupItem.cs b/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupItem.cs index f107c4630..87a603a03 100644 --- a/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupItem.cs +++ b/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupItem.cs @@ -115,6 +115,10 @@ public class LineGroupItem : MonoBehaviour } LineObjectPool.Instance.PushItemToPool(this); } + else + { + Debug.LogError("ɾʧܣ" + x); + } })); } else diff --git a/GQ_URP/GQ/Assets/StreamingAssets/editorDebugging.txt b/GQ_URP/GQ/Assets/StreamingAssets/editorDebugging.txt index d598f319d..199c28a57 100644 --- a/GQ_URP/GQ/Assets/StreamingAssets/editorDebugging.txt +++ b/GQ_URP/GQ/Assets/StreamingAssets/editorDebugging.txt @@ -6,7 +6,7 @@ "heatThresholdValueMin": "5", "humidityThresholdValueMax": "20", "humidityThresholdValueMin": "80", - "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzU5MDcyNjIsInVzZXJuYW1lIjoiYWRtaW4ifQ.cXS9OLTjefc32SA4P4nRnoH9vrR7GRMm9scBaPaYKxg" + "token": "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MzYzMjc4NzIsInVzZXJuYW1lIjoiYWRtaW4ifQ.g7GbqWmwv0Fct3QhwMOIZtfDo8brbxkApWVnzLlrKJY" }, "serverTime": "1715417370490" } \ No newline at end of file diff --git a/GQ_URP/GQ/Assets/script/前端交互/WebInteraction.cs b/GQ_URP/GQ/Assets/script/前端交互/WebInteraction.cs index f6671af54..53b7f0aad 100644 --- a/GQ_URP/GQ/Assets/script/前端交互/WebInteraction.cs +++ b/GQ_URP/GQ/Assets/script/前端交互/WebInteraction.cs @@ -122,6 +122,43 @@ public class WebInteraction : MonoBehaviour 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>(ct); + // } + // else + // { + // Debug.Log("获取地址错误!"); + // } + //})); #endif //StartCoroutine(QiangZhi()); } @@ -138,7 +175,8 @@ public class WebInteraction : MonoBehaviour unity_power_value(s); }); //Debug.Log("版本号 1.1.1"); - btnRobotWebPage.onClick.AddListener(() => { + btnRobotWebPage.onClick.AddListener(() => + { OpenRobotWebPage(); }); } @@ -232,7 +270,7 @@ public class WebInteraction : MonoBehaviour } catch (Exception e) { - Debug.Log("序列化-循环环境查询错误：" + e.Message); + Debug.Log("序列化-循环环境查询错误：" + e.Message + "\n" + e.StackTrace); } } })); @@ -258,7 +296,7 @@ public class WebInteraction : MonoBehaviour } - + /// /// 前端调用此方法传递Token /// @@ -305,12 +343,12 @@ public class WebInteraction : MonoBehaviour foreach (var item in root.data[i].children) { menu_name.Add(item.menuName); - for(int j=0;j< item.children.Count; j++) + for (int j = 0; j < item.children.Count; j++) { menu_name.Add(item.children[j].menuName); } } - + } Debug.Log("@@QX7"); openMenu(); @@ -373,7 +411,7 @@ public class WebInteraction : MonoBehaviour ms.Add(menu_struct[0]); ms.Add(menu_struct[1]); ms.Add(menu_struct[2]); - + bool isFind_ison = false; for (int i = 1; i < ms.Count; i++) @@ -425,7 +463,7 @@ public class WebInteraction : MonoBehaviour } - + /// /// 设置三级菜单初始IsOn /// diff --git a/GQ_URP/GQ/Assets/script/画线/CreateLine.cs b/GQ_URP/GQ/Assets/script/画线/CreateLine.cs index a850f85e3..8ef89c550 100644 --- a/GQ_URP/GQ/Assets/script/画线/CreateLine.cs +++ b/GQ_URP/GQ/Assets/script/画线/CreateLine.cs @@ -819,11 +819,13 @@ public class CreateLine : CabinetUIBase int cjB = GameManager.Inst.CengJi((go2.GetComponent().deviceList.devicePosition).Split('-')[0]); 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 { - Creat7(list7[i - 1], list7[i], cjB); + //Creat7(list7[i - 1], list7[i], cjB); + Creat7(list7[i - 1], list7[i], 6); } } catch (Exception e)