diff --git a/GQ_URP/GQ/Assets/Adam/Scripts/DragController.cs b/GQ_URP/GQ/Assets/Adam/Scripts/DragController.cs index c87d7d60e..2dcef9172 100644 --- a/GQ_URP/GQ/Assets/Adam/Scripts/DragController.cs +++ b/GQ_URP/GQ/Assets/Adam/Scripts/DragController.cs @@ -90,22 +90,43 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, //EndDragAction?.Invoke(targetObject); if (!currentUPosItem || !uPosManger) { + //从暂存箱抽出，不能删除 + if (deviceManager.stagingParent == targetObject.transform.parent) + { + targetObject.gameObject.SetActive(false); + RecoverSet(); + readCapacityAgain(); + return; + } + DestroyImmediate(targetObject.gameObject); RecoverSet(); + readCapacityAgain(); return; } else if (!isCard) { if (string.IsNullOrEmpty(d.deviceList.id)) { + //从暂存箱抽出，不能删除 + if (deviceManager.stagingParent == targetObject.transform.parent) + { + targetObject.gameObject.SetActive(false); + RecoverSet(); + readCapacityAgain(); + return; + } + DestroyImmediate(targetObject.gameObject); RecoverSet(); + readCapacityAgain(); return; } else { targetObject.gameObject.SetActive(false); RecoverSet(); + readCapacityAgain(); return; } } @@ -139,7 +160,7 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, if (targetObject.GetComponentInChildren(true)) targetObject.GetComponentInChildren(true).gameObject.SetActive(true); - + readCapacityAgain(); RecoverSet(); } @@ -348,7 +369,36 @@ public class DragController : MonoBehaviour, IBeginDragHandler, IEndDragHandler, } } - + /// + /// 重新读取容量标识颜色 + /// + public void readCapacityAgain() + { + if (uPosManger) + { + var items = uPosManger.uPosItems; + for (int i = 0; i < items.Length; i++) + { + if (items[i].transform.childCount > 1) + { + DeviceItem device = items[i].transform.GetChild(1).GetComponent(); + if (device != null) + { + var capacity = device.volume; + for (int j = 0; j < capacity; j++) + { + items[i + j].SetInstructColor(Color.red); + } + i = (i + capacity - 1); + } + } + else + { + items[i].SetInstructColor(Color.green); + } + } + } + } private void OnRay(GameObject target) { diff --git a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Materials/xj_16.mat b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Materials/xj_16.mat index 845624f4e..82054b88e 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Materials/xj_16.mat +++ b/GQ_URP/GQ/Assets/GameAssets/Materials/机柜内设备/Materials/xj_16.mat @@ -11,14 +11,17 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_ValidKeywords: - _EMISSION + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 2 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -89,7 +92,7 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0 @@ -103,11 +106,11 @@ Material: - _Smoothness: 0.5 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Surface: 0 + - _SrcBlend: 5 + - _Surface: 1 - _UVSec: 0 - _WorkflowMode: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 0.79058963, g: 0.79058963, b: 0.79058963, a: 1} - _Color: {r: 0.79058963, g: 0.79058963, b: 0.79058963, a: 1} diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX index 631d6479a..46b732d04 100644 Binary files a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX and b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX differ diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX.meta b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX.meta index 9126ccfe3..16bba2be7 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX.meta +++ b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1073.FBX.meta @@ -2,7 +2,10 @@ fileFormatVersion: 2 guid: a4a392a67fb87d545bde3e31583bb7ad ModelImporter: serializedVersion: 21202 - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 74: 1827226128182048838 + second: Take 001 externalObjects: - first: type: UnityEngine:Material diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX index 14870d57e..b8524f2d4 100644 Binary files a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX and b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX differ diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX.meta b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX.meta index 852ea83c7..2b67b2504 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX.meta +++ b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1084.FBX.meta @@ -2,7 +2,10 @@ fileFormatVersion: 2 guid: 0768dad42d0aea549b366795b4bbf6d0 ModelImporter: serializedVersion: 21202 - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 74: 1827226128182048838 + second: Take 001 externalObjects: - first: type: UnityEngine:Material diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX index 027afd4d6..5a6c7cdae 100644 Binary files a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX and b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX differ diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX.meta b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX.meta index f390f162a..3e0ac3b03 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX.meta +++ b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/板卡/1085.FBX.meta @@ -2,7 +2,10 @@ fileFormatVersion: 2 guid: bc2490faeab152f4881d1a5a7d958427 ModelImporter: serializedVersion: 21202 - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 74: 1827226128182048838 + second: Take 001 externalObjects: - first: type: UnityEngine:Material diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX index 98140300b..abca6a9d5 100644 Binary files a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX and b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX differ diff --git a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX.meta b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX.meta index 3787f7cec..9cc2acc6c 100644 --- a/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX.meta +++ b/GQ_URP/GQ/Assets/GameAssets/Models/机柜内设备/除板卡外模型更新(11.23)/99.FBX.meta @@ -2,7 +2,10 @@ fileFormatVersion: 2 guid: e0a48af6f3222324a80ff90763106fd4 ModelImporter: serializedVersion: 21202 - internalIDToNameTable: [] + internalIDToNameTable: + - first: + 74: 1827226128182048838 + second: Take 001 externalObjects: - first: type: UnityEngine:Material diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/100.prefab b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/100.prefab index 2fa53f191..cc38c8a7c 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/100.prefab +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/100.prefab @@ -53,7 +53,7 @@ MonoBehaviour: conf2: isUse: 1 module_type: 2 - type_card: 22 + type_card: 32 isUseUPostItem: 1 --- !u!33 &2482427437850871170 MeshFilter: @@ -130,7 +130,7 @@ MonoBehaviour: conf2: isUse: 1 module_type: 2 - type_card: 22 + type_card: 32 isUseUPostItem: 1 --- !u!33 &948607560263877630 MeshFilter: @@ -933,7 +933,7 @@ MonoBehaviour: conf2: isUse: 1 module_type: 2 - type_card: 22 + type_card: 32 isUseUPostItem: 1 --- !u!33 &5067018972128247790 MeshFilter: @@ -1010,7 +1010,7 @@ MonoBehaviour: conf2: isUse: 1 module_type: 2 - type_card: 22 + type_card: 32 isUseUPostItem: 1 --- !u!33 &7467866176701025836 MeshFilter: diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1011.prefab b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1011.prefab index e364f9525..1b26d1d99 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1011.prefab +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1011.prefab @@ -11,13 +11,13 @@ GameObject: - component: {fileID: 3454503702326045786} - component: {fileID: 1756130375893345279} - component: {fileID: 4592528180043421493} - - component: {fileID: 7491744240344145947} - component: {fileID: 3083151262103478622} + - component: {fileID: 7491744240344145947} - component: {fileID: 8145854686235549679} - - component: {fileID: 6036935244973586665} - - component: {fileID: 7392444222398463424} + - component: {fileID: 7022009141382663499} - component: {fileID: 1647826051226913746} - m_Layer: 8 + - component: {fileID: 7392444222398463424} + m_Layer: 13 m_Name: 1011 m_TagString: Untagged m_Icon: {fileID: 0} @@ -96,6 +96,28 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3083151262103478622 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2646722933243393760} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1fd81313f40351c42bfdc5c8c418e56a, type: 3} + m_Name: + m_EditorClassIdentifier: + listTargets: [] + frames: [] + PerTier: 42 + PerRow: 5 + volume: 0 + isExit: 0 + isClicked: 0 + isTarget: 0 + isplace: 0 + canPut: 0 --- !u!114 &7491744240344145947 MonoBehaviour: m_ObjectHideFlags: 0 @@ -160,28 +182,6 @@ MonoBehaviour: createTime: createName: hight: {fileID: 0} ---- !u!114 &3083151262103478622 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2646722933243393760} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fd81313f40351c42bfdc5c8c418e56a, type: 3} - m_Name: - m_EditorClassIdentifier: - listTargets: [] - frames: [] - PerTier: 42 - PerRow: 5 - volume: 0 - isExit: 0 - isClicked: 0 - isTarget: 0 - isplace: 0 - canPut: 0 --- !u!114 &8145854686235549679 MonoBehaviour: m_ObjectHideFlags: 0 @@ -195,7 +195,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: tmsAlarmLists: [] ---- !u!114 &6036935244973586665 +--- !u!114 &7022009141382663499 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -204,19 +204,29 @@ MonoBehaviour: m_GameObject: {fileID: 2646722933243393760} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 65c073f1f8dbbe64da03bf56cea22ae7, type: 3} + m_Script: {fileID: 11500000, guid: 116065a4ce5d3ea40810a9d682afd2cb, type: 3} m_Name: m_EditorClassIdentifier: isTransparentGlow: 0 - meshRenderers: [] - materials: [] + My_magnifyState: 0 empty: [] TransparentGlow_Shader: {fileID: 0} - TransparentGlow_Shader_half: {fileID: 0} - original_jigui: [] - original_shebei: [] - search_u_wei: 0 - is_jigui: 0 + yiDong_pos: {x: 2.1, y: 1.1, z: 0} + fangDa_rot: {x: 0, y: -90, z: 0} +--- !u!64 &1647826051226913746 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2646722933243393760} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -1141464603633071787, guid: b6e571046313da7468f699fc3022686b, type: 3} --- !u!114 &7392444222398463424 MonoBehaviour: m_ObjectHideFlags: 0 @@ -231,17 +241,3 @@ MonoBehaviour: m_EditorClassIdentifier: volume: 1 selfIcon: {fileID: 21300000, guid: 7b2506558c8b9be469ac6d58679a868d, type: 3} ---- !u!64 &1647826051226913746 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2646722933243393760} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: -1141464603633071787, guid: 00a9cfd37947b39419b7d4e2ee3b69d2, type: 3} diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1019.prefab b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1019.prefab index 697ade8fe..93f134260 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1019.prefab +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1019.prefab @@ -115,7 +115,7 @@ MonoBehaviour: conf2: isUse: 1 module_type: 2 - type_card: 4 + type_card: 6 isUseUPostItem: 0 deviceList: id: diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab index bfb89eb7c..cb02328db 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1567837632082552790 +--- !u!1 &6327200718080861053 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,46 +8,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2309663395400085724} - - component: {fileID: 5987803576148631200} - - component: {fileID: 8868719674962810869} - m_Layer: 0 - m_Name: Object010 + - component: {fileID: 6666852656582900167} + - component: {fileID: 7722178842972993122} + - component: {fileID: 5534440120438080168} + - component: {fileID: 5304021200521188163} + - component: {fileID: 5449608539111103121} + - component: {fileID: 5111894750066865254} + - component: {fileID: 4519261564182610599} + - component: {fileID: 1934570418358318834} + m_Layer: 13 + m_Name: 1073 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2309663395400085724 +--- !u!4 &6666852656582900167 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1567837632082552790} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0, y: 7.48567e-10, z: 0.18309477} + m_GameObject: {fileID: 6327200718080861053} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0, y: 0.18309477, z: -7.48567e-10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 4456778043461205376} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5987803576148631200 +--- !u!33 &7722178842972993122 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1567837632082552790} + m_GameObject: {fileID: 6327200718080861053} m_Mesh: {fileID: 7643229109163234770, guid: a4a392a67fb87d545bde3e31583bb7ad, type: 3} ---- !u!23 &8868719674962810869 +--- !u!23 &5534440120438080168 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1567837632082552790} + m_GameObject: {fileID: 6327200718080861053} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -89,50 +94,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &3932338091388544826 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4456778043461205376} - - component: {fileID: 3635626218515087793} - - component: {fileID: 6151726217104538958} - - component: {fileID: 2678514983643291634} - - component: {fileID: 215368238078523929} - - component: {fileID: 340620335110053385} - m_Layer: 13 - m_Name: 1073 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4456778043461205376 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3932338091388544826} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 2309663395400085724} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!114 &3635626218515087793 +--- !u!114 &5304021200521188163 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3932338091388544826} + m_GameObject: {fileID: 6327200718080861053} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3} @@ -190,26 +158,26 @@ MonoBehaviour: createTime: createName: hight: {fileID: 0} ---- !u!114 &6151726217104538958 +--- !u!114 &5449608539111103121 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3932338091388544826} + m_GameObject: {fileID: 6327200718080861053} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6bdd6e5953a48524db661ab7d81d57d0, type: 3} m_Name: m_EditorClassIdentifier: tmsAlarmLists: [] ---- !u!114 &2678514983643291634 +--- !u!114 &5111894750066865254 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3932338091388544826} + m_GameObject: {fileID: 6327200718080861053} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 116065a4ce5d3ea40810a9d682afd2cb, type: 3} @@ -221,27 +189,27 @@ MonoBehaviour: TransparentGlow_Shader: {fileID: 0} yiDong_pos: {x: 2.1, y: 1.1, z: 0} fangDa_rot: {x: 0, y: -90, z: 0} ---- !u!64 &215368238078523929 +--- !u!64 &4519261564182610599 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3932338091388544826} + m_GameObject: {fileID: 6327200718080861053} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} ---- !u!114 &340620335110053385 + m_Mesh: {fileID: 7643229109163234770, guid: a4a392a67fb87d545bde3e31583bb7ad, type: 3} +--- !u!114 &1934570418358318834 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3932338091388544826} + m_GameObject: {fileID: 6327200718080861053} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6bc0a67b27552c54e893bf2db7023587, type: 3} diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab.meta b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab.meta index 1d5b359f8..4d3b41ece 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab.meta +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1073.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc9fb1d90c821244bacc3d7a7a7d7d75 +guid: 6c94590d4b9e1a343a61a8944c86b0d1 PrefabImporter: externalObjects: {} userData: diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab index 48325bc9a..4f42c7581 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &6924280626257292598 +--- !u!1 &7482522354852429426 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,46 +8,51 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8083513460306069128} - - component: {fileID: 3902022507040640282} - - component: {fileID: 9053280052572345788} - m_Layer: 0 - m_Name: Box020 + - component: {fileID: 7826291728508626120} + - component: {fileID: 6571676862707837805} + - component: {fileID: 8995867688950194087} + - component: {fileID: 1256879122816008832} + - component: {fileID: 7516725348606795510} + - component: {fileID: 1057332995061509142} + - component: {fileID: 2729541209749728096} + - component: {fileID: 6024628906697887275} + m_Layer: 13 + m_Name: 1084 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8083513460306069128 +--- !u!4 &7826291728508626120 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6924280626257292598} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.08, y: 0.0000000020201218, z: 0.17878504} + m_GameObject: {fileID: 7482522354852429426} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0.08, y: 0.17878506, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7023778214200920568} + m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3902022507040640282 +--- !u!33 &6571676862707837805 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6924280626257292598} + m_GameObject: {fileID: 7482522354852429426} m_Mesh: {fileID: -5395582760244232606, guid: 0768dad42d0aea549b366795b4bbf6d0, type: 3} ---- !u!23 &9053280052572345788 +--- !u!23 &8995867688950194087 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6924280626257292598} + m_GameObject: {fileID: 7482522354852429426} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -89,50 +94,13 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &7652365354192245570 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7023778214200920568} - - component: {fileID: 1765214073126508779} - - component: {fileID: 5054434632064236444} - - component: {fileID: 5973313366142229740} - - component: {fileID: 2947984866449036295} - - component: {fileID: 1600619007975101399} - m_Layer: 13 - m_Name: 1084 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7023778214200920568 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7652365354192245570} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8083513460306069128} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!114 &1765214073126508779 +--- !u!114 &1256879122816008832 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7652365354192245570} + m_GameObject: {fileID: 7482522354852429426} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3} @@ -190,26 +158,26 @@ MonoBehaviour: createTime: createName: hight: {fileID: 0} ---- !u!114 &5054434632064236444 +--- !u!114 &7516725348606795510 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7652365354192245570} + m_GameObject: {fileID: 7482522354852429426} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6bdd6e5953a48524db661ab7d81d57d0, type: 3} m_Name: m_EditorClassIdentifier: tmsAlarmLists: [] ---- !u!114 &5973313366142229740 +--- !u!114 &1057332995061509142 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7652365354192245570} + m_GameObject: {fileID: 7482522354852429426} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 116065a4ce5d3ea40810a9d682afd2cb, type: 3} @@ -221,27 +189,27 @@ MonoBehaviour: TransparentGlow_Shader: {fileID: 0} yiDong_pos: {x: 2.1, y: 1.1, z: 0} fangDa_rot: {x: 0, y: -90, z: 0} ---- !u!64 &2947984866449036295 +--- !u!64 &2729541209749728096 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7652365354192245570} + m_GameObject: {fileID: 7482522354852429426} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} ---- !u!114 &1600619007975101399 + m_Mesh: {fileID: -5395582760244232606, guid: 0768dad42d0aea549b366795b4bbf6d0, type: 3} +--- !u!114 &6024628906697887275 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7652365354192245570} + m_GameObject: {fileID: 7482522354852429426} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6bc0a67b27552c54e893bf2db7023587, type: 3} diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab.meta b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab.meta index d21fbf46c..95b596dce 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab.meta +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1084.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 033e840bbbd57224c95aa5371a6cbb62 +guid: bbcd741c88664574bb7910f7cc05f7b3 PrefabImporter: externalObjects: {} userData: diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab index a1468dc5f..ccb850171 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1820412050374039407 +--- !u!1 &245644492258069483 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,170 +8,14 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3278428215482097274} - - component: {fileID: 1663086403992312871} - - component: {fileID: 3683485235585587225} - m_Layer: 11 - m_Name: Cylinder (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3278428215482097274 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1820412050374039407} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0.3107, y: 0.00089998543, z: 0.094700016} - m_LocalScale: {x: 0.010000002, y: 0.010000002, z: 0.010000002} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 8741778690166764978} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!136 &1663086403992312871 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1820412050374039407} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.28 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} ---- !u!114 &3683485235585587225 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1820412050374039407} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} - m_Name: - m_EditorClassIdentifier: - hight: {fileID: 0} - portList: - id: - port: - portCode: - portName: - portType: - portPosition: 2 - deviceId: - deviceName: - portModel: - status: 1 - conDevice: - conDeviceName: - conPort: - cableName: - cableGroupName: - remark: - createTime: - createName: ---- !u!1 &4178136947908321531 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 757802235447884289} - - component: {fileID: 6452220352163582603} - - component: {fileID: 4604294879859152387} - m_Layer: 11 - m_Name: Cylinder (3) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &757802235447884289 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4178136947908321531} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0.3107, y: 0.0006999895, z: 0.083100006} - m_LocalScale: {x: 0.010000002, y: 0.010000002, z: 0.010000002} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 8741778690166764978} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!136 &6452220352163582603 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4178136947908321531} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.28 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} ---- !u!114 &4604294879859152387 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4178136947908321531} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} - m_Name: - m_EditorClassIdentifier: - hight: {fileID: 0} - portList: - id: - port: - portCode: - portName: - portType: - portPosition: 4 - deviceId: - deviceName: - portModel: - status: 1 - conDevice: - conDeviceName: - conPort: - cableName: - cableGroupName: - remark: - createTime: - createName: ---- !u!1 &8222123537881132808 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8741778690166764978} - - component: {fileID: 833321481849621896} - - component: {fileID: 9111190808696224324} - - component: {fileID: 9101988520621434138} - - component: {fileID: 4379821727621643040} - - component: {fileID: 1609701321532937015} + - component: {fileID: 586423365500309841} + - component: {fileID: 4579245361149615860} + - component: {fileID: 1758735012745538110} + - component: {fileID: 8367163048724829444} + - component: {fileID: 3045566938456822362} + - component: {fileID: 1723787881657730238} + - component: {fileID: 588988573805196513} + - component: {fileID: 5262666520870396474} m_Layer: 13 m_Name: 1085 m_TagString: Untagged @@ -179,33 +23,84 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8741778690166764978 +--- !u!4 &586423365500309841 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8222123537881132808} + m_GameObject: {fileID: 245644492258069483} m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0.079999976, y: 0.17878506, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7495705965397490370} - - {fileID: 2391951929195762848} - - {fileID: 3278428215482097274} - - {fileID: 2990368891131134159} - - {fileID: 757802235447884289} + m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!114 &833321481849621896 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &4579245361149615860 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 245644492258069483} + m_Mesh: {fileID: -5395582760244232606, guid: bc2490faeab152f4881d1a5a7d958427, type: 3} +--- !u!23 &1758735012745538110 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 245644492258069483} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 48f115dd1ac80274aa23e34e54805269, type: 2} + - {fileID: 2100000, guid: b74b0e728e1713348b932b7c8a41f444, type: 2} + - {fileID: 2100000, guid: bd12e094389412d4d89510614ac2c164, type: 2} + - {fileID: 2100000, guid: 7876e3bdb59592c4f815fedde787c37e, type: 2} + - {fileID: 2100000, guid: 10236623513f12c4cb82923408ab50f2, type: 2} + - {fileID: 2100000, guid: f401da9e617004c4d9a134ea419dff7b, type: 2} + - {fileID: 2100000, guid: ce4d94322c65882478c9c6dc0a92d168, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &8367163048724829444 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8222123537881132808} + m_GameObject: {fileID: 245644492258069483} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 11640fdcb68030044a769500d95e1506, type: 3} @@ -263,26 +158,26 @@ MonoBehaviour: createTime: createName: hight: {fileID: 0} ---- !u!114 &9111190808696224324 +--- !u!114 &3045566938456822362 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8222123537881132808} + m_GameObject: {fileID: 245644492258069483} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6bdd6e5953a48524db661ab7d81d57d0, type: 3} m_Name: m_EditorClassIdentifier: tmsAlarmLists: [] ---- !u!114 &9101988520621434138 +--- !u!114 &1723787881657730238 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8222123537881132808} + m_GameObject: {fileID: 245644492258069483} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 116065a4ce5d3ea40810a9d682afd2cb, type: 3} @@ -294,27 +189,27 @@ MonoBehaviour: TransparentGlow_Shader: {fileID: 0} yiDong_pos: {x: 2.1, y: 1.1, z: 0} fangDa_rot: {x: 0, y: -90, z: 0} ---- !u!64 &4379821727621643040 +--- !u!64 &588988573805196513 MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8222123537881132808} + m_GameObject: {fileID: 245644492258069483} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 m_Convex: 0 m_CookingOptions: 30 - m_Mesh: {fileID: 0} ---- !u!114 &1609701321532937015 + m_Mesh: {fileID: -5395582760244232606, guid: bc2490faeab152f4881d1a5a7d958427, type: 3} +--- !u!114 &5262666520870396474 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8222123537881132808} + m_GameObject: {fileID: 245644492258069483} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6bc0a67b27552c54e893bf2db7023587, type: 3} @@ -322,250 +217,3 @@ MonoBehaviour: m_EditorClassIdentifier: volume: 1 selfIcon: {fileID: 21300000, guid: 054210acda546b840a7969df37c77188, type: 3} ---- !u!1 &8664799232508924284 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7495705965397490370} - - component: {fileID: 3318788706765533520} - - component: {fileID: 7317160035142773238} - m_Layer: 0 - m_Name: Box020 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7495705965397490370 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8664799232508924284} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.079999976, y: 8.881784e-16, z: 0.17878504} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 8741778690166764978} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3318788706765533520 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8664799232508924284} - m_Mesh: {fileID: -5395582760244232606, guid: bc2490faeab152f4881d1a5a7d958427, type: 3} ---- !u!23 &7317160035142773238 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8664799232508924284} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 48f115dd1ac80274aa23e34e54805269, type: 2} - - {fileID: 2100000, guid: b74b0e728e1713348b932b7c8a41f444, type: 2} - - {fileID: 2100000, guid: bd12e094389412d4d89510614ac2c164, type: 2} - - {fileID: 2100000, guid: 7876e3bdb59592c4f815fedde787c37e, type: 2} - - {fileID: 2100000, guid: 10236623513f12c4cb82923408ab50f2, type: 2} - - {fileID: 2100000, guid: f401da9e617004c4d9a134ea419dff7b, type: 2} - - {fileID: 2100000, guid: ce4d94322c65882478c9c6dc0a92d168, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &9065770778488883788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2391951929195762848} - - component: {fileID: 4474468426474593526} - - component: {fileID: 1187636975304925234} - m_Layer: 11 - m_Name: Cylinder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2391951929195762848 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9065770778488883788} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0.3107, y: 0.006599985, z: 0.09480002} - m_LocalScale: {x: 0.010000002, y: 0.010000002, z: 0.010000002} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 8741778690166764978} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!136 &4474468426474593526 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9065770778488883788} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.28 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} ---- !u!114 &1187636975304925234 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9065770778488883788} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} - m_Name: - m_EditorClassIdentifier: - hight: {fileID: 0} - portList: - id: - port: - portCode: - portName: - portType: - portPosition: 1 - deviceId: - deviceName: - portModel: - status: 1 - conDevice: - conDeviceName: - conPort: - cableName: - cableGroupName: - remark: - createTime: - createName: ---- !u!1 &9122911048457921491 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2990368891131134159} - - component: {fileID: 704597201496722747} - - component: {fileID: 2755900780364420952} - m_Layer: 11 - m_Name: Cylinder (2) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2990368891131134159 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9122911048457921491} - m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0.3107, y: 0.0063999966, z: 0.083200015} - m_LocalScale: {x: 0.010000002, y: 0.010000002, z: 0.010000002} - m_ConstrainProportionsScale: 1 - m_Children: [] - m_Father: {fileID: 8741778690166764978} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} ---- !u!136 &704597201496722747 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9122911048457921491} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.28 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0.000000059604645, y: 0, z: -0.00000008940697} ---- !u!114 &2755900780364420952 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9122911048457921491} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dda2647c5b2efd54ca9422f5e246bd75, type: 3} - m_Name: - m_EditorClassIdentifier: - hight: {fileID: 0} - portList: - id: - port: - portCode: - portName: - portType: - portPosition: 3 - deviceId: - deviceName: - portModel: - status: 1 - conDevice: - conDeviceName: - conPort: - cableName: - cableGroupName: - remark: - createTime: - createName: diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab.meta b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab.meta index 51ec506b3..667dcae84 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab.meta +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/1085.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2151fc925bb065f4ea0f068cba4b0c12 +guid: cec08930c6b5ebc4199274edb659e6cf PrefabImporter: externalObjects: {} userData: diff --git a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/94.prefab b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/94.prefab index 44c8b1a75..2a3bd1bbb 100644 --- a/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/94.prefab +++ b/GQ_URP/GQ/Assets/Resources/古泉站机房模型90个型号/94.prefab @@ -896,7 +896,7 @@ MonoBehaviour: isUse: 1 module_type: 1 type_card: 0 - isUseUPostItem: 0 + isUseUPostItem: 1 deviceList: id: deviceName: diff --git a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity index 28e35d5b5..93a2c5243 100644 --- a/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity +++ b/GQ_URP/GQ/Assets/Scenes/SampleSceneG_URP4.unity @@ -14946,7 +14946,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 59510595} m_HandleRect: {fileID: 59510594} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 0.9999919 m_NumberOfSteps: 0 m_OnValueChanged: @@ -15783,7 +15783,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: -176.47363, y: 0.0035577426} + m_AnchoredPosition: {x: 0, y: -0.000067794695} m_SizeDelta: {x: 318.95, y: 443.74} m_Pivot: {x: 0.5, y: 1} --- !u!114 &413199003 @@ -20930,7 +20930,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &585162568 MonoBehaviour: m_ObjectHideFlags: 0 @@ -21022,12 +21022,12 @@ RectTransform: m_GameObject: {fileID: 585162567} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -10.376958} - m_LocalScale: {x: 0.02, y: 0.020000001, z: 0.020000001} + m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1919396427} - m_Father: {fileID: 0} - m_RootOrder: 17 + m_Father: {fileID: 2017587869} + m_RootOrder: 30 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -27586,7 +27586,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &765685630 MonoBehaviour: m_ObjectHideFlags: 0 @@ -27678,12 +27678,12 @@ RectTransform: m_GameObject: {fileID: 765685629} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -10.376958} - m_LocalScale: {x: 0.02, y: 0.020000001, z: 0.020000001} + m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 395754429} - m_Father: {fileID: 0} - m_RootOrder: 18 + m_Father: {fileID: 2017587869} + m_RootOrder: 31 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -52364,7 +52364,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1445508115 MonoBehaviour: m_ObjectHideFlags: 0 @@ -52514,8 +52514,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2099858061} - m_Father: {fileID: 0} - m_RootOrder: 21 + m_Father: {fileID: 2017587869} + m_RootOrder: 34 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -60622,7 +60622,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1676334397 MonoBehaviour: m_ObjectHideFlags: 0 @@ -60714,12 +60714,12 @@ RectTransform: m_GameObject: {fileID: 1676334396} m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: -10.376958} - m_LocalScale: {x: 0.02, y: 0.020000001, z: 0.020000001} + m_LocalScale: {x: 0.02, y: 0.02, z: 0.02} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1419808488} - m_Father: {fileID: 0} - m_RootOrder: 19 + m_Father: {fileID: 2017587869} + m_RootOrder: 32 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -63333,7 +63333,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1327205619} m_HandleRect: {fileID: 1327205618} m_Direction: 0 - m_Value: 65712.87 + m_Value: 0.5 m_Size: 0.9999916 m_NumberOfSteps: 0 m_OnValueChanged: @@ -66172,7 +66172,7 @@ MonoBehaviour: jqr_xj_cx: jqr_bctp: arguments: - token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDUwNDY4NzYsInVzZXJuYW1lIjoiMTc4OTQ1NjEyMzAifQ.IscL0KRhZlspG2wmZRBSxzZ23m16D6I9ZmNt1ujDUZY + token: eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE3MDk2MDM4ODEsInVzZXJuYW1lIjoiYWRtaW4ifQ.Z6ck2M9FRChYkQsHbxyaEPJFHVAcvw0pp5nXy_EttO4 heatThresholdValueMax: heatThresholdValueMin: humidityThresholdValueMax: @@ -67532,7 +67532,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1857218848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -67628,8 +67628,8 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1790580412} - m_Father: {fileID: 0} - m_RootOrder: 20 + m_Father: {fileID: 2017587869} + m_RootOrder: 33 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -74433,6 +74433,11 @@ Transform: - {fileID: 15436526} - {fileID: 1023018615} - {fileID: 438091771} + - {fileID: 585162571} + - {fileID: 765685633} + - {fileID: 1676334400} + - {fileID: 1857218851} + - {fileID: 1445508118} m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -122628,7 +122633,7 @@ PrefabInstance: - target: {fileID: 1907843774066353948, guid: f12e732b7b6c24e489ac02c8af4e7a78, type: 3} propertyPath: m_AnchoredPosition.y - value: -0.000030070543 + value: -0.000015558595 objectReference: {fileID: 0} - target: {fileID: 1907843774098386396, guid: f12e732b7b6c24e489ac02c8af4e7a78, type: 3} @@ -156792,6 +156797,11 @@ PrefabInstance: propertyPath: rectTransform value: objectReference: {fileID: 734862545} + - target: {fileID: 1320083962101217945, guid: 1e43385ddb3feca44b3c45d23ef4fae7, + type: 3} + propertyPath: roomInspection + value: + objectReference: {fileID: 1517122712} - target: {fileID: 1320083962101217951, guid: 1e43385ddb3feca44b3c45d23ef4fae7, type: 3} propertyPath: m_Name diff --git a/GQ_URP/GQ/Assets/Scripts/SearchName.cs b/GQ_URP/GQ/Assets/Scripts/SearchName.cs index 3500455bc..c94be4ff2 100644 --- a/GQ_URP/GQ/Assets/Scripts/SearchName.cs +++ b/GQ_URP/GQ/Assets/Scripts/SearchName.cs @@ -195,6 +195,7 @@ public class SearchName : MonoBehaviour } public int _co = -1; + public RoomInspection roomInspection = new RoomInspection(); /// /// б /// diff --git a/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs b/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs index 0b54a5fb7..3e2f38e63 100644 --- a/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs +++ b/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineGroupManager.cs @@ -115,6 +115,14 @@ public class LineGroupManager : MonoBehaviour } })); } + else + { + add_group_pop.SetActive(false); + SecondConfirmPanel.DeleteConform((returnValue) => + { + add_group_pop.SetActive(true); + }, "Ϊ"); + } }); cancel_line_group_button.onClick.AddListener(() => { @@ -130,6 +138,15 @@ public class LineGroupManager : MonoBehaviour //޸ editSave_group_button.onClick.AddListener(() => { + if (string.IsNullOrWhiteSpace(line_group_editName_inputfield.text)) + { + edit_group_pop.SetActive(false); + SecondConfirmPanel.DeleteConform((returnValue) => + { + edit_group_pop.SetActive(true); + }, "Ϊ"); + return; + } // LineQuery.Inst.editJsonCoroutine(selected_group_ID, line_group_editName_inputfield.text, (x, y) => { @@ -250,6 +267,7 @@ public class LineGroupManager : MonoBehaviour { addxianlan(); panel_object.SetActive(true); + GameManager.Inst.portCloseFlashing(); } })); //AddLineGroupInit(); diff --git a/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineItem.cs b/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineItem.cs index 85c8a801c..b7b4552e3 100644 --- a/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineItem.cs +++ b/GQ_URP/GQ/Assets/Scripts/WJ/LineGroup/LineItem.cs @@ -58,6 +58,7 @@ public class LineItem : MonoBehaviour RedactPort.Inst.PortList1_game = locatingCable.lines[0].gameObject; RedactPort.Inst.PortList2 = locatingCable.lines[1].GetComponent().portList; + RedactPort.Inst.PortList2_game = locatingCable.lines[1].gameObject; } else { @@ -66,6 +67,7 @@ public class LineItem : MonoBehaviour RedactPort.Inst.PortList1_game = locatingCable.lines[1].gameObject; RedactPort.Inst.PortList2 = locatingCable.lines[0].GetComponent().portList; + RedactPort.Inst.PortList2_game = locatingCable.lines[0].gameObject; } GameManager.Inst.nowDeviceID = p.portList.id; RedactPort.Inst.PortList1 = p.portList; @@ -78,6 +80,8 @@ public class LineItem : MonoBehaviour RedactPort.Inst.AutoShowInfo(p, true); PatternChoose.Inst.dk_bj_page.SetActive(true); RedactPort.Inst.PortList2 = _PortList2; + + GameManager.Inst.portOpenFlashing(locatingCable.lines[0].gameObject, locatingCable.lines[1].gameObject); }); delete_button.onClick.AddListener(() => { diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_0.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_0.asset index 03a9fd3de..fea0a3d93 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_0.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_0.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 01 LensName: 01 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_1.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_1.asset index 06c2bc348..28cbcbdd2 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_1.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_1.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 02 LensName: 02 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_10.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_10.asset index 0ee48ff9a..59b2c327d 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_10.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_10.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 11 LensName: 11 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_11.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_11.asset index 84db600e1..9382e55df 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_11.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_11.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 12 LensName: 12 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_12.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_12.asset index f4b4d37f6..359214fac 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_12.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_12.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 13 LensName: 13 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_13.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_13.asset index 3ca6efaef..31dec3488 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_13.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_13.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 14 LensName: 14 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_14.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_14.asset index a6250407b..64c36adff 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_14.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_14.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 15 LensName: 15 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_15.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_15.asset index 0b3a8fb33..ec54ea1b5 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_15.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_15.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 16 LensName: 16 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_2.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_2.asset index 1bebaf0a5..3a48fff4e 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_2.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_2.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 03 LensName: 03 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_3.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_3.asset index 0e0c1210a..2733e4612 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_3.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_3.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 04 LensName: 04 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_4.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_4.asset index af0340625..568b7f79a 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_4.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_4.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 05 LensName: 05 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_5.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_5.asset index c9a3c5bbc..cf161e7b7 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_5.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_5.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 06 LensName: 06 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_6.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_6.asset index 6159765c1..ddba4e03f 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_6.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_6.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 07 LensName: 07 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_7.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_7.asset index 497c7d100..943e4358f 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_7.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_7.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 08 LensName: 08 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_8.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_8.asset index 1d2e83164..478b32c0f 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_8.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_8.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 09 LensName: 09 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_9.asset b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_9.asset index 69a227b5b..0c4594207 100644 --- a/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_9.asset +++ b/GQ_URP/GQ/Assets/conf/摄像头/BaseConf_9.asset @@ -16,5 +16,10 @@ MonoBehaviour: isUse: 1 isPicture: 0 base64: - LensID: + LensID: 10 LensName: 10 + conf2: + isUse: 0 + module_type: 0 + type_card: 0 + isUseUPostItem: 1 diff --git a/GQ_URP/GQ/Assets/script/GameManager.cs b/GQ_URP/GQ/Assets/script/GameManager.cs index 42a4a94ba..7a17dca30 100644 --- a/GQ_URP/GQ/Assets/script/GameManager.cs +++ b/GQ_URP/GQ/Assets/script/GameManager.cs @@ -5,6 +5,7 @@ using System.Collections; using System.Collections.Generic; using System.Linq; using System.Reflection; +using Unity.Burst.CompilerServices; using UnityEngine; using UnityEngine.Networking; using UnityEngine.UI; @@ -2245,6 +2246,7 @@ public class GameManager : MonoBehaviour // 获取接口信息 public IEnumerator Initialize(Action callback = null, bool isInFo = false) { + portCloseFlashing(); yield return null; //Debug.Log("@@10"); isLoading = false; @@ -2413,7 +2415,19 @@ public class GameManager : MonoBehaviour { var g = FindParent(TmsPorts_go[i], IsDesiredParent); if (g && g.activeSelf) - TmsPorts_go[i].GetComponent().hight.SetActive(true); + { + var p = TmsPorts_go[i].GetComponent(); + + p.hight.SetActive(true); + + if (!string.IsNullOrEmpty(p.portList.conDevice)) + WebInteraction.Inst.changC(p.hight, "1"); + } + } + + if (transform) + { + } } else if (magnifyState && CabinetUIManager.Instance.current_menu == Menu.M_数字孪生_场景管理) @@ -2601,6 +2615,46 @@ public class GameManager : MonoBehaviour } + private Coroutine stopCor_1; + /// + /// 开启端口闪烁 + /// + /// + /// + public void portOpenFlashing(GameObject port1, GameObject port2) + { + //return; + stopCor_1 = StartCoroutine(OpenFlashing(port1, port2)); + } + + IEnumerator OpenFlashing(GameObject port1, GameObject port2) + { + GameObject H1 = port1.GetComponent().hight; + GameObject H2 = port2.GetComponent().hight; + H1.SetActive(true); + H2.SetActive(true); + //ClickEventLens clickEventLens = new ClickEventLens(); + while (true) + { + WebInteraction.Inst.changC(H1, "4"); + WebInteraction.Inst.changC(H2, "4"); + yield return new WaitForSeconds(0.75f); + WebInteraction.Inst.changC(H1, "1"); + WebInteraction.Inst.changC(H2, "1"); + yield return new WaitForSeconds(0.75f); + } + } + + /// + /// 关闭端口闪烁 + /// + public void portCloseFlashing() + { + if (stopCor_1 != null) + StopCoroutine(stopCor_1); + } + + /// /// 接口地址 /// diff --git a/GQ_URP/GQ/Assets/script/房间检测/RoomInspection.cs b/GQ_URP/GQ/Assets/script/房间检测/RoomInspection.cs index eadfdc16e..983ef2f34 100644 --- a/GQ_URP/GQ/Assets/script/房间检测/RoomInspection.cs +++ b/GQ_URP/GQ/Assets/script/房间检测/RoomInspection.cs @@ -1,9 +1,16 @@ using System.Collections; using System.Collections.Generic; +using Unity.VisualScripting; using UnityEngine; public class RoomInspection : MonoBehaviour { + public static RoomInspection Inst; + + private void Awake() + { + Inst = this; + } // Start is called before the first frame update void Start() { @@ -14,13 +21,27 @@ public class RoomInspection : MonoBehaviour // Update is called once per frame void Update() { - + } public void OnTriggerEnter(Collider other) + { + displayRoof(other.gameObject); + } + + public void OnTriggerExit(Collider other) + { + hideRoof(other.gameObject); + } + + /// + /// ʾݶ + /// + public void displayRoof(GameObject other) { //Debug.Log(other.gameObject.name); - if (other.gameObject != Camera.main.gameObject) + //if (other.gameObject != Camera.main.gameObject) + if (other != Camera.main.gameObject) return; if (ExtendedFlycam.Inst.room == ExtendedFlycam.Room.None) { @@ -49,10 +70,14 @@ public class RoomInspection : MonoBehaviour } } - public void OnTriggerExit(Collider other) + /// + /// ݶ + /// + public void hideRoof(GameObject other) { //Debug.Log(other.gameObject.name); - if (other.gameObject != Camera.main.gameObject) + //if (other.gameObject != Camera.main.gameObject) + if (other != Camera.main.gameObject) return; ExtendedFlycam.Inst.peiDianShiD.SetActive(false); ExtendedFlycam.Inst.jiFangD.SetActive(false); diff --git a/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs b/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs index 9d05f0953..03360e0ab 100644 --- a/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs +++ b/GQ_URP/GQ/Assets/script/接口/修改/AddDevice.cs @@ -215,9 +215,14 @@ public class AddDevice : MonoBehaviour private IEnumerator SaveJsonCoroutine() { - yield return StartCoroutine(saveJson((x) => + yield return StartCoroutine(saveJson((reFillIn, x) => { - if (x != null && URlreturn != null && URlreturn.message == "操作成功") + // 回调为 reFillIn 时为重新填写不关闭弹窗 + if (reFillIn == "reFillIn") + { + SecondConfirmPanel.DeleteConform(null, URlreturn.message); + } + else if (x != null && URlreturn != null && URlreturn.message == "操作成功") { //StartCoroutine(Succeed()); addInFo(); @@ -411,8 +416,9 @@ public class AddDevice : MonoBehaviour } - public IEnumerator saveJson(Action callback = null) + public IEnumerator saveJson(Action callback = null) { + // 回调为 reFillIn 时为重新填写不关闭弹窗 //if (type.value == 0 || deviceType.value == 0 || status.value == 2) yield break; try { @@ -444,7 +450,13 @@ public class AddDevice : MonoBehaviour mybody.status = string.IsNullOrEmpty(status.captionText.text) ? null : status.value.ToString(); - mybody.deviceName = !string.IsNullOrEmpty(deviceName.text) ? deviceName.text : null; + if (string.IsNullOrWhiteSpace(deviceName.text)) + { + URlreturn.message = "设备名不允许为空"; + callback?.Invoke("reFillIn", URlreturn); + yield break; + } + mybody.deviceName = deviceName.text; mybody.deviceCode = !string.IsNullOrEmpty(deviceCode.text) ? deviceCode.text : null; mybody.manufacturer = !string.IsNullOrEmpty(manufacturer.text) ? manufacturer.text : null; mybody.directorName = !string.IsNullOrEmpty(directorName.text) ? directorName.text : null; @@ -455,7 +467,7 @@ public class AddDevice : MonoBehaviour { Debug.Log("新增设备错误：" + e.Message + "\n" + e.StackTrace); gameObject.SetActive(false); - callback.Invoke(null); + callback.Invoke(null, null); yield break; } @@ -473,12 +485,12 @@ public class AddDevice : MonoBehaviour try { URlreturn = JsonConvert.DeserializeObject(jsonResult); - callback?.Invoke(URlreturn); + callback?.Invoke(null, URlreturn); } catch (Exception e) { Debug.Log("新增设备接口错误：" + e.Message); - callback.Invoke(null); + callback.Invoke(null, null); } }) ); diff --git a/GQ_URP/GQ/Assets/script/接口/修改/RedactDevice.cs b/GQ_URP/GQ/Assets/script/接口/修改/RedactDevice.cs index 6c35da4b1..4f3a1ee28 100644 --- a/GQ_URP/GQ/Assets/script/接口/修改/RedactDevice.cs +++ b/GQ_URP/GQ/Assets/script/接口/修改/RedactDevice.cs @@ -216,9 +216,14 @@ public class RedactDevice : MonoBehaviour if (string.IsNullOrEmpty(y)) { Debug.Log("编辑设备失败"); - SecondConfirmPanel.DeleteConform(null, "编辑设备失败"); + SecondConfirmPanel.DeleteConform(null, string.IsNullOrEmpty(URlreturn.message) ? "编辑设备失败" : URlreturn.message); refurbish(); } + else if (y == "reFillIn") + { + Debug.Log(URlreturn.message); + SecondConfirmPanel.DeleteConform(null, URlreturn.message); + } else { if (URlreturn != null && URlreturn.message == "操作成功") @@ -241,7 +246,7 @@ public class RedactDevice : MonoBehaviour else { Debug.Log("编辑设备失败: " + URlreturn.message); - SecondConfirmPanel.DeleteConform(null, "编辑设备失败"); + SecondConfirmPanel.DeleteConform(null, string.IsNullOrEmpty(URlreturn.message) ? "编辑设备失败" : URlreturn.message); refurbish(); } } @@ -300,6 +305,7 @@ public class RedactDevice : MonoBehaviour public IEnumerator saveJson(Action callback) { + // 回调为 reFillIn 时为重新填写不关闭弹窗 if (type.value == 0 || deviceType.value == 0 || status.value > 1) yield break; if (string.IsNullOrEmpty(mybody.id)) yield break; @@ -308,6 +314,12 @@ public class RedactDevice : MonoBehaviour if (type) mybody.type = type.value.ToString(); if (deviceType) mybody.deviceType = deviceType.value == 0 ? null : deviceType.value.ToString(); if (deviceName) mybody.deviceName = deviceName.text; + if (string.IsNullOrWhiteSpace(deviceName.text)) + { + URlreturn.message = "设备名不允许为空"; + callback?.Invoke("reFillIn"); + yield break; + } if (deviceCode) mybody.deviceCode = deviceCode.text; if (devicePosition) mybody.devicePosition = devicePosition.text; if (machineModel) mybody.machineModel = machineModel.text; diff --git a/GQ_URP/GQ/Assets/script/接口/修改/RedactPort.cs b/GQ_URP/GQ/Assets/script/接口/修改/RedactPort.cs index 1335b9013..1ab11578b 100644 --- a/GQ_URP/GQ/Assets/script/接口/修改/RedactPort.cs +++ b/GQ_URP/GQ/Assets/script/接口/修改/RedactPort.cs @@ -541,10 +541,12 @@ public class RedactPort : MonoBehaviour portCode.text = p.portList.portCode;//② 编号 portName.text = p.portList.portName;//③ 名称 port.text = p.portList.port;//④ 端口 - cableName.text = p.portList.cableName; - add_cableGroupName_options(); - if (findIndex(cableGroupName, p.portList.cableGroupName) == null) + if (!string.IsNullOrEmpty(p.portList.conDevice))// 线缆名 + cableName.text = p.portList.cableName; + + add_cableGroupName_options();// 线缆组名 + if (!string.IsNullOrEmpty(p.portList.conDevice) && findIndex(cableGroupName, p.portList.cableGroupName) == null) findIndex(cableGroupName, ""); addconCabinet(); @@ -553,9 +555,9 @@ public class RedactPort : MonoBehaviour //findIndex(startCabinet, c.name); findIndex(startCabinet, c.GetComponent().deviceList.deviceName); - add_portType_options(); - if (findIndex(portType, p.portList.portType) == null) - findIndex(cableGroupName, ""); + add_portType_options();// 线路类型 + if (!string.IsNullOrEmpty(p.portList.conDevice) && findIndex(portType, p.portList.portType) == null) + findIndex(portType, ""); } /// @@ -965,8 +967,9 @@ public class RedactPort : MonoBehaviour else { Debug.Log("编辑端口失败: " + URlreturn.message); - SecondConfirmPanel.DeleteConform(null, (x != null && URlreturn != null) ? URlreturn.message : "编辑端口失败"); - refurbish(); + SecondConfirmPanel.DeleteConform(null, (URlreturn != null) ? URlreturn.message : "编辑端口失败"); + if (x != "isNull") + refurbish(); } })); } @@ -1207,11 +1210,6 @@ public class RedactPort : MonoBehaviour try { - mybody.cableName = cableName.text; - if (LineQuery.Inst.keyValues.ContainsKey(cableGroupName.captionText.text)) - mybody.cableGroupName = LineQuery.Inst.keyValues[cableGroupName.captionText.text]; - else - mybody.cableGroupName = null; mybody.portType = string.IsNullOrEmpty(portType.captionText.text) ? null : portType.captionText.text; mybody.deviceId = deviceName_dic.ContainsKey(deviceName.text) ? deviceName_dic[deviceName.text] : null; mybody.portCode = portCode.text; @@ -1221,9 +1219,67 @@ public class RedactPort : MonoBehaviour mybody.conDevice = conDevice_dic.ContainsKey(conDeviceName.text) ? conDevice_dic[conDeviceName.text] : null; mybody.conPort = conPort.text; - mybody.conId = PortList2.id; + //mybody.conId = PortList2.id; mybody.conPortCode = conPortCode.text; mybody.conPortName = conPortName.text; + + // 回调传参 isNull 则编辑弹窗不关闭 + bool isNull = string.IsNullOrEmpty(mybody.conDevice); + + + + if (LineQuery.Inst.keyValues.ContainsKey(cableGroupName.captionText.text)) + mybody.cableGroupName = LineQuery.Inst.keyValues[cableGroupName.captionText.text]; + else + mybody.cableGroupName = null; + + // 检测 + if (isNull) + { + mybody.cableName = null; + mybody.cableGroupName = null; + } + else + { + // 起始端口未选择 + if (string.IsNullOrEmpty(mybody.id)) + { + URlreturn.message = "请选择端口"; + callback?.Invoke("isNull"); + yield break; + } + + // 本地回环 + if (PortList1.id == PortList2.id) + { + URlreturn.message = "该线路为本地回环，请重新选择连接线路"; + callback?.Invoke("isNull"); + yield break; + } + + // 检测线缆名 + if (CheckString(cableName.text)) + { + mybody.cableName = cableName.text; + } + else + { + URlreturn.message = "请填写线缆名"; + callback?.Invoke("isNull"); + yield break; + } + + // 检测线缆组名 + if (CheckString(mybody.cableGroupName)) { } + else + { + URlreturn.message = "请填写线缆所属组名"; + callback?.Invoke("isNull"); + yield break; + } + } + + mybody.conId = PortList2?.id; } catch (Exception e) { @@ -1272,6 +1328,15 @@ public class RedactPort : MonoBehaviour } } + bool CheckString(string input) + { + if (string.IsNullOrWhiteSpace(input)) + { + return false; + } + return true; // 如果没有空字符串或者只包含空格则返回true + } + public void OnDisable() { PortList2 = null; diff --git a/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs b/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs index 21a300e06..1338114bf 100644 --- a/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs +++ b/GQ_URP/GQ/Assets/script/点击/ClickEvent.cs @@ -2,6 +2,7 @@ using DG.Tweening; using System; using System.Collections.Generic; using System.Linq; +using Unity.Burst.CompilerServices; using UnityEngine; using UnityEngine.EventSystems; using static BaseConf; @@ -94,7 +95,7 @@ public class ClickEvent : MonoBehaviour Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); RaycastHit hit/* = new RaycastHit()*/; - if (Physics.Raycast(ray, out hit, 100, 1 << 19 | 1 << 20 | 1 << 21 | 1 << 22)) + if (GameManager.Inst.magnifyState && Physics.Raycast(ray, out hit, 100, 1 << 19 | 1 << 20 | 1 << 21 | 1 << 22)) { if ((hit.collider.gameObject.layer == 20 || hit.collider.gameObject.layer == 21) && GetComponent() /*&& GetComponent().deviceList.modelNum == "23"*/) @@ -119,6 +120,7 @@ public class ClickEvent : MonoBehaviour } return; } + // 豸ǰ else if (hit.collider.gameObject.layer == 22 && GetComponent() /*&& (GetComponent().deviceList.modelNum == "100" || GetComponent().deviceList.modelNum == "101")*/) { var insertAndUnplug = hit.collider.gameObject.GetComponent(); @@ -141,6 +143,7 @@ public class ClickEvent : MonoBehaviour } return; } + // 豸 else if (hit.collider.gameObject.layer == 19 && GetComponent()) { var insertAndUnplug = hit.collider.gameObject.GetComponent(); @@ -239,115 +242,122 @@ public class ClickEvent : MonoBehaviour if (Menu.M__ == CabinetUIManager.Instance.current_menu && GameManager.Inst.magnifyState) { - if (Physics.Raycast(ray, out hit, 100, 1 << 8 | 1 << 14 | 1 << 13 | 1 << 20 | 1 << 21 | 1 << 6))//ģͣ豸-8 -14 -20 -21 + if (Physics.Raycast(ray, out hit, 100, /*1 << 8 | */1 << 14 | 1 << 13 | 1 << 20 | 1 << 21 | 1 << 6))//ģͣ豸-8 -14 -20 -21 { if (hit.collider.gameObject.layer == 14) return; - //else if ((hit.collider.gameObject.layer == 20 || hit.collider.gameObject.layer == 21) && - // GetComponent() && GetComponent().deviceList.modelNum == "23") + /* + else if ((hit.collider.gameObject.layer == 20 || hit.collider.gameObject.layer == 21) && + GetComponent() && GetComponent().deviceList.modelNum == "23") + { + var insertAndUnplug = hit.collider.gameObject.GetComponent(); + if (insertAndUnplug) + { + if (insertAndUnplug.isMove) + return; + if (insertAndUnplug.isStart) + { + insertAndUnplug.isMove = true; + unplug(insertAndUnplug.transform, 0.2f, () => { insertAndUnplug.isMove = false; }); + insertAndUnplug.isStart = !insertAndUnplug.isStart; + } + else + { + insertAndUnplug.isMove = true; + insertion(insertAndUnplug.transform, insertAndUnplug.startPos_local, () => { insertAndUnplug.isMove = false; }); + insertAndUnplug.isStart = !insertAndUnplug.isStart; + } + } + return; + } + */ + ConfigureDevices(hit); + //else if (hit.collider.gameObject == gameObject) //{ - // var insertAndUnplug = hit.collider.gameObject.GetComponent(); - // if (insertAndUnplug) + // GameManager.Inst.nowDevice = null; + // GameManager.Inst.nowDeviceID = null; + // Debug.Log("" + gameObject.name); + // //PatternChoose.Inst.sb_bj_page.SetActive(false); + // //PatternChoose.Inst.sb_xz_page.SetActive(false); + // //PatternChoose.Inst.dk_bj_page.SetActive(false); + // //PatternChoose.Inst.dk_xz_page.SetActive(false); + // //PatternChoose.Inst.sb_ck_page.SetActive(false); + // PatternChoose.Inst.clspup(CabinetUIManager.Instance.current_menu); + // GameManager.Inst.now_CK_Device = null; + + // GameManager.Inst.search_box.SetActive(false); + // var d = gameObject.GetComponent(); + // var cabinet = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent); + // DragController drag = GameManager.Inst.gameObject.GetComponent().dragController.GetComponent(); + + // if (d && GameManager.Inst.magnifyState) // { - // if (insertAndUnplug.isMove) - // return; - // if (insertAndUnplug.isStart) + // if (string.IsNullOrEmpty(d.deviceList.id)) // { - // insertAndUnplug.isMove = true; - // unplug(insertAndUnplug.transform, 0.2f, () => { insertAndUnplug.isMove = false; }); - // insertAndUnplug.isStart = !insertAndUnplug.isStart; + + // GameManager.Inst.lastDevice = gameObject; + // GameManager.Inst.lastDeviceID = null; + + // GameManager.Inst.nowDevice = gameObject; + + + + // //PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(true);// + // } // else // { - // insertAndUnplug.isMove = true; - // insertion(insertAndUnplug.transform, insertAndUnplug.startPos_local, () => { insertAndUnplug.isMove = false; }); - // insertAndUnplug.isStart = !insertAndUnplug.isStart; + // GameManager.Inst.lastDevice = gameObject; + // GameManager.Inst.lastDeviceID = d.deviceList.id; + + + // GameManager.Inst.nowDeviceID = d.deviceList.id; + // GameManager.Inst.nowDevice = gameObject; + + + + + // //PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(true);// // } + // /*if (string.IsNullOrEmpty(d.deviceList.id) && d.deviceList.deviceType == "3") + // { + // PatternChoose.Inst.sb_xz_page.SetActive(true); + // GameManager.Inst.objectToShow_add.SetActive(false); + // } + // else if (!string.IsNullOrEmpty(d.deviceList.id) && d.deviceList.deviceType == "3") + // { + // PatternChoose.Inst.sb_bj_page.SetActive(true); + // GameManager.Inst.objectToShow_add.SetActive(false); + // } + // else*/ + + // if (d.deviceList.type == "1") + // { + // PatternChoose.Inst.sb_bj_page.SetActive(true); + // } + // else if (drag && GameManager.Inst.nowCabine == cabinet) + // { + // GameManager.Inst.now_CK_Device = gameObject; + // PatternChoose.Inst.sb_ck_page.SetActive(false); + // drag.uPosManger = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindParent_UPosManger).GetComponent(); + // GameManager.Inst.gameObject.GetComponent().uposManger = drag.uPosManger; + // //drag.oriObjectPrefab = gameObject.GetComponent(); + // gameObject.GetComponent().OnselfClick(); + // GameManager.Inst.objectToShow_add.SetActive(true); + // GameManager.Inst.search_box.SetActive(true); + // if (CarouselMenuALL.Inst.gameObject.activeSelf) + // { + // CarouselMenuALL.Inst.Filter_Type(); + // } + // } + // else + // GameManager.Inst.editorMenu.gameObject.SetActive(false); // } - // return; //} - else if (hit.collider.gameObject == gameObject) - { - GameManager.Inst.nowDevice = null; - GameManager.Inst.nowDeviceID = null; - Debug.Log("" + gameObject.name); - //PatternChoose.Inst.sb_bj_page.SetActive(false); - //PatternChoose.Inst.sb_xz_page.SetActive(false); - //PatternChoose.Inst.dk_bj_page.SetActive(false); - //PatternChoose.Inst.dk_xz_page.SetActive(false); - //PatternChoose.Inst.sb_ck_page.SetActive(false); - PatternChoose.Inst.clspup(CabinetUIManager.Instance.current_menu); - GameManager.Inst.now_CK_Device = null; - - GameManager.Inst.search_box.SetActive(false); - var d = gameObject.GetComponent(); - var cabinet = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent); - DragController drag = GameManager.Inst.gameObject.GetComponent().dragController.GetComponent(); - - if (d && GameManager.Inst.magnifyState) - { - if (string.IsNullOrEmpty(d.deviceList.id)) - { - - GameManager.Inst.lastDevice = gameObject; - GameManager.Inst.lastDeviceID = null; - - GameManager.Inst.nowDevice = gameObject; - - - - //PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(true);// - - } - else - { - GameManager.Inst.lastDevice = gameObject; - GameManager.Inst.lastDeviceID = d.deviceList.id; - - - GameManager.Inst.nowDeviceID = d.deviceList.id; - GameManager.Inst.nowDevice = gameObject; - - - - - //PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(true);// - } - /*if (string.IsNullOrEmpty(d.deviceList.id) && d.deviceList.deviceType == "3") - { - PatternChoose.Inst.sb_xz_page.SetActive(true); - GameManager.Inst.objectToShow_add.SetActive(false); - } - else if (!string.IsNullOrEmpty(d.deviceList.id) && d.deviceList.deviceType == "3") - { - PatternChoose.Inst.sb_bj_page.SetActive(true); - GameManager.Inst.objectToShow_add.SetActive(false); - } - else*/ - - if (d.deviceList.type == "1") - { - PatternChoose.Inst.sb_bj_page.SetActive(true); - } - else if (drag && GameManager.Inst.nowCabine == cabinet) - { - GameManager.Inst.now_CK_Device = gameObject; - PatternChoose.Inst.sb_ck_page.SetActive(false); - drag.uPosManger = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindParent_UPosManger).GetComponent(); - GameManager.Inst.gameObject.GetComponent().uposManger = drag.uPosManger; - //drag.oriObjectPrefab = gameObject.GetComponent(); - gameObject.GetComponent().OnselfClick(); - GameManager.Inst.objectToShow_add.SetActive(true); - GameManager.Inst.search_box.SetActive(true); - if (CarouselMenuALL.Inst.gameObject.activeSelf) - { - CarouselMenuALL.Inst.Filter_Type(); - } - } - else - GameManager.Inst.editorMenu.gameObject.SetActive(false); - } - } + } + else if (Physics.Raycast(ray, out hit, 100, 1 << 8)) + { + ConfigureDevices(hit); } } else if (Menu.M___ == CabinetUIManager.Instance.current_menu && GameManager.Inst.magnifyState && GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent) == GameManager.Inst.nowCabine) @@ -656,6 +666,96 @@ public class ClickEvent : MonoBehaviour } } + /// + /// 豸 + /// + /// + void ConfigureDevices(RaycastHit hit) + { + if (hit.collider.gameObject == gameObject) + { + GameManager.Inst.nowDevice = null; + GameManager.Inst.nowDeviceID = null; + Debug.Log("" + gameObject.name); + //PatternChoose.Inst.sb_bj_page.SetActive(false); + //PatternChoose.Inst.sb_xz_page.SetActive(false); + //PatternChoose.Inst.dk_bj_page.SetActive(false); + //PatternChoose.Inst.dk_xz_page.SetActive(false); + //PatternChoose.Inst.sb_ck_page.SetActive(false); + PatternChoose.Inst.clspup(CabinetUIManager.Instance.current_menu); + GameManager.Inst.now_CK_Device = null; + + GameManager.Inst.search_box.SetActive(false); + var d = gameObject.GetComponent(); + var cabinet = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsDesiredParent); + DragController drag = GameManager.Inst.gameObject.GetComponent().dragController.GetComponent(); + + if (d && GameManager.Inst.magnifyState) + { + if (string.IsNullOrEmpty(d.deviceList.id)) + { + + GameManager.Inst.lastDevice = gameObject; + GameManager.Inst.lastDeviceID = null; + + GameManager.Inst.nowDevice = gameObject; + + + + //PatternChoose.Inst.transform.Find("豸/豸").gameObject.SetActive(true);// + + } + else + { + GameManager.Inst.lastDevice = gameObject; + GameManager.Inst.lastDeviceID = d.deviceList.id; + + + GameManager.Inst.nowDeviceID = d.deviceList.id; + GameManager.Inst.nowDevice = gameObject; + + + + + //PatternChoose.Inst.sb_bj_page.SetActive(false);.gameObject.SetActive(true);// + } + /*if (string.IsNullOrEmpty(d.deviceList.id) && d.deviceList.deviceType == "3") + { + PatternChoose.Inst.sb_xz_page.SetActive(true); + GameManager.Inst.objectToShow_add.SetActive(false); + } + else if (!string.IsNullOrEmpty(d.deviceList.id) && d.deviceList.deviceType == "3") + { + PatternChoose.Inst.sb_bj_page.SetActive(true); + GameManager.Inst.objectToShow_add.SetActive(false); + } + else*/ + + if (d.deviceList.type == "1") + { + PatternChoose.Inst.sb_bj_page.SetActive(true); + } + else if (drag && GameManager.Inst.nowCabine == cabinet) + { + GameManager.Inst.now_CK_Device = gameObject; + PatternChoose.Inst.sb_ck_page.SetActive(false); + drag.uPosManger = GameManager.Inst.FindParent(gameObject, GameManager.Inst.IsFindParent_UPosManger).GetComponent(); + GameManager.Inst.gameObject.GetComponent().uposManger = drag.uPosManger; + //drag.oriObjectPrefab = gameObject.GetComponent(); + gameObject.GetComponent().OnselfClick(); + GameManager.Inst.objectToShow_add.SetActive(true); + GameManager.Inst.search_box.SetActive(true); + if (CarouselMenuALL.Inst.gameObject.activeSelf) + { + CarouselMenuALL.Inst.Filter_Type(); + } + } + else + GameManager.Inst.editorMenu.gameObject.SetActive(false); + } + } + } + private void OnMouseEnter() { if (!CabinetUIManager.Instance) @@ -888,7 +988,10 @@ public class ClickEvent : MonoBehaviour GameManager.Inst.nowCabine = cabine; //Ŵ if (isZoomin) + { Zoomin(cabine); + RoomInspection.Inst.displayRoof(Camera.main.gameObject); + } //С else //Zoomout(cabine); diff --git a/GQ_URP/GQ/Assets/script/画线/CreateLine.cs b/GQ_URP/GQ/Assets/script/画线/CreateLine.cs index 172e164dd..9a395a951 100644 --- a/GQ_URP/GQ/Assets/script/画线/CreateLine.cs +++ b/GQ_URP/GQ/Assets/script/画线/CreateLine.cs @@ -184,12 +184,12 @@ public class CreateLine : CabinetUIBase //setColorline(p, prefab_xianlan.gameObject); try { - string hex=string.Empty; + string hex = string.Empty; if (p.startFlag == 1) hex = PatternChoose.Inst.xianlan.lineCode_dic[p.portType]; else { - var _p= B.GetComponent().portList; + var _p = B.GetComponent().portList; hex = PatternChoose.Inst.xianlan.lineCode_dic[_p.portType]; } HexToColor(hex, (x) => @@ -561,15 +561,9 @@ public class CreateLine : CabinetUIBase Vector3 v1 = A.position + new Vector3(-0.06f, 0, 0); Vector3 v2 = v1 + new Vector3(edge_Distance * 1, 0, 0) * -1; Vector3 v2_mid = v2 + new Vector3(0, 0, ap.z - v2.z); - //Vector3 v3 = v2 + new Vector3(0, vectors_tall[hierarchy].y - v2.y, 0); - //Vector3 v4 = v3 + new Vector3(0, 0, B.position.z - v3.z); - //Vector3 v5 = v4 + new Vector3(B.position.x - v3.x + edge_Distance, 0, 0); - //Vector3 v6 = v5 + new Vector3(0, B.position.y - v5.y, 0); - //Vector3 v7 = B.position; Vector3 v3 = v2_mid + new Vector3(0, vectors_tall[hierarchy].y - v2_mid.y, 0); Vector3 v4 = v3 + new Vector3(0, 0, bp.z - v3.z); - //Vector3 v4_mid1 = v3 + new Vector3(B.position.x + edge_Distance - v4.x, 0, 0);//? - Vector3 v4_mid1 = v3 + new Vector3(bp.x - v4.x, 0, 0); + Vector3 v4_mid1 = v4 + new Vector3(bp.x - v4.x, 0, 0); Vector3 v5 = v4_mid1 + new Vector3(0, B.position.y - v4.y, 0); Vector3 v6 = v5 + new Vector3(0, 0, B.position.z - v5.z); Vector3 v7 = B.position; diff --git a/GQ_URP/GQ/Assets/script/画线/LineInfor.cs b/GQ_URP/GQ/Assets/script/画线/LineInfor.cs index 600fc05e8..cf955a81c 100644 --- a/GQ_URP/GQ/Assets/script/画线/LineInfor.cs +++ b/GQ_URP/GQ/Assets/script/画线/LineInfor.cs @@ -136,7 +136,8 @@ public class LineInfor : MonoBehaviour // 设置Emission颜色 material.EnableKeyword("_EMISSION");// 启用发光 - material.SetColor("_EmissionColor", newColor); + //material.SetColor("_EmissionColor", newColor); + material.SetColor("_EmissionCol", newColor); } public void setcolor(Color color) @@ -147,7 +148,8 @@ public class LineInfor : MonoBehaviour // 设置Emission颜色 material.EnableKeyword("_EMISSION");// 启用发光 - material.SetColor("_EmissionColor", color); + //material.SetColor("_EmissionColor", color); + material.SetColor("_EmissionCol", color); } #region JSON