From 72e57e4a65ec9b26122dafef7b70a15a600c5f96 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Tue, 19 Nov 2024 15:58:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Assets/Scenes/MainScene.unity | 823 +++++++++++++++++- .../Scripts/wj/CameraCtrl/CameraMove.cs | 2 +- .../Scripts/wj/CustomUI/CustomGroupButton.cs | 3 +- .../Assets/Scripts/wj/Manager/ApiManager.cs | 150 +++- .../Assets/Scripts/wj/Manager/UIManager.cs | 19 +- .../Assets/Scripts/wj/Manager/UIRoot.cs | 9 + .../MeasuringScale/MeasuringScale.cs | 21 + .../wj/Table&Chart/VideoPage/VideoWebPage.cs | 2 +- .../StreamingAssets/configure_camera.json | 4 +- 9 files changed, 967 insertions(+), 66 deletions(-) diff --git a/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity b/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity index be9ce6a4..7e488f96 100644 --- a/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity +++ b/BulkCargo_UnityProject/Assets/Scenes/MainScene.unity @@ -406,7 +406,7 @@ RectTransform: m_Children: - {fileID: 1169982891} m_Father: {fileID: 1861333842} - m_RootOrder: 10 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -1107,7 +1107,7 @@ RectTransform: - {fileID: 1488587285} - {fileID: 518552549} m_Father: {fileID: 1861333842} - m_RootOrder: 14 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -5941,11 +5941,13 @@ MonoBehaviour: Time_YYMMDD: {fileID: 0} Time_Week: {fileID: 0} Time_HHmmss: {fileID: 0} + companName: {fileID: 0} RoamingButton: {fileID: 0} ShipNameInputField: {fileID: 0} VoyageInputField: {fileID: 0} DischargeLocationInputField: {fileID: 0} GoodsNameInputField: {fileID: 0} + BillOfLadingInputField: {fileID: 0} SearchButton: {fileID: 0} ClearSearchButton: {fileID: 0} MeasuringScale: {fileID: 0} @@ -8149,6 +8151,163 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 798936699} m_CullTransparentMesh: 1 +--- !u!1 &809745166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 809745167} + - component: {fileID: 809745170} + - component: {fileID: 809745169} + - component: {fileID: 809745168} + m_Layer: 0 + m_Name: Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &809745167 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809745166} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 917565979} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &809745168 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809745166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 +--- !u!114 &809745169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809745166} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u8BF7\u8F93\u5165" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2} + m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 2164260863 + m_fontColor: {r: 1, g: 1, b: 1, a: 0.5} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &809745170 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809745166} + m_CullTransparentMesh: 1 --- !u!1 &811273842 GameObject: m_ObjectHideFlags: 0 @@ -9365,6 +9524,59 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915193858} m_CullTransparentMesh: 1 +--- !u!1 &917565978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 917565979} + - component: {fileID: 917565980} + m_Layer: 0 + m_Name: Text Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &917565979 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917565978} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 809745167} + - {fileID: 2039329791} + m_Father: {fileID: 1823661507} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -0.5} + m_SizeDelta: {x: -20, y: -13} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &917565980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 917565978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: -8, y: -5, z: -8, w: -5} + m_Softness: {x: 0, y: 0} --- !u!1 &924002416 GameObject: m_ObjectHideFlags: 0 @@ -10298,7 +10510,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1861333842} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -12210,7 +12422,7 @@ RectTransform: m_Children: - {fileID: 2137604579} m_Father: {fileID: 1861333842} - m_RootOrder: 15 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -13507,7 +13719,7 @@ RectTransform: m_Children: - {fileID: 300376735} m_Father: {fileID: 1861333842} - m_RootOrder: 12 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -14099,7 +14311,7 @@ RectTransform: m_Children: - {fileID: 502724955} m_Father: {fileID: 1861333842} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -14847,6 +15059,142 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432243638} m_CullTransparentMesh: 1 +--- !u!1 &1437272832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1437272833} + - component: {fileID: 1437272835} + - component: {fileID: 1437272834} + m_Layer: 0 + m_Name: companName + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1437272833 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437272832} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1861333842} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -419.3711, y: 95.899994} + m_SizeDelta: {x: 392.0331, y: 133.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1437272834 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437272832} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: xxxxxxxxxxxxxxxxxxxxxxxx + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2} + m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 30 + m_fontSizeBase: 30 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: -2 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1437272835 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1437272832} + m_CullTransparentMesh: 1 --- !u!1 &1438870701 GameObject: m_ObjectHideFlags: 0 @@ -15260,7 +15608,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1861333842} - m_RootOrder: 13 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -17564,7 +17912,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1861333842} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -18206,7 +18554,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1861333842} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -18817,7 +19165,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1861333842} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -19270,6 +19618,182 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1817082481} m_CullTransparentMesh: 1 +--- !u!1 &1823661506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1823661507} + - component: {fileID: 1823661510} + - component: {fileID: 1823661509} + - component: {fileID: 1823661508} + m_Layer: 0 + m_Name: BillOfLadingInputField + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1823661507 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823661506} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 917565979} + m_Father: {fileID: 2025095658} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 5, y: -1.2000732} + m_SizeDelta: {x: 180, y: 36} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1823661508 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823661506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1823661509} + m_TextViewport: {fileID: 917565979} + m_TextComponent: {fileID: 2039329792} + m_Placeholder: {fileID: 809745169} + m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbarEventHandler: {fileID: 0} + m_LayoutGroup: {fileID: 0} + m_ScrollSensitivity: 1 + m_ContentType: 0 + m_InputType: 0 + m_AsteriskChar: 42 + m_KeyboardType: 0 + m_LineType: 0 + m_HideMobileInput: 0 + m_HideSoftKeyboard: 0 + m_CharacterValidation: 0 + m_RegexValue: + m_GlobalPointSize: 14 + m_CharacterLimit: 0 + m_OnEndEdit: + m_PersistentCalls: + m_Calls: [] + m_OnSubmit: + m_PersistentCalls: + m_Calls: [] + m_OnSelect: + m_PersistentCalls: + m_Calls: [] + m_OnDeselect: + m_PersistentCalls: + m_Calls: [] + m_OnTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnEndTextSelection: + m_PersistentCalls: + m_Calls: [] + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_OnTouchScreenKeyboardStatusChanged: + m_PersistentCalls: + m_Calls: [] + m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_CustomCaretColor: 0 + m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} + m_Text: + m_CaretBlinkRate: 0.85 + m_CaretWidth: 1 + m_ReadOnly: 0 + m_RichText: 1 + m_GlobalFontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_OnFocusSelectAll: 1 + m_ResetOnDeActivation: 1 + m_RestoreOriginalTextOnEscape: 1 + m_isRichTextEditingAllowed: 0 + m_LineLimit: 0 + m_InputValidator: {fileID: 0} +--- !u!114 &1823661509 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823661506} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: d1b5ff0b3a5287044bab5dc4f4e6db5e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1823661510 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1823661506} + m_CullTransparentMesh: 1 --- !u!1 &1838781421 GameObject: m_ObjectHideFlags: 0 @@ -19890,12 +20414,14 @@ RectTransform: - {fileID: 1854991082} - {fileID: 795475434} - {fileID: 255460422} + - {fileID: 2025095658} - {fileID: 2041808796} - {fileID: 1308901788} - {fileID: 1729675815} - {fileID: 1783471186} - {fileID: 984235956} - {fileID: 1674400507} + - {fileID: 1437272833} - {fileID: 43147942} - {fileID: 1942977187} - {fileID: 1275927582} @@ -20908,7 +21434,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1861333842} - m_RootOrder: 11 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -21334,6 +21860,279 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_IsOn: 1 +--- !u!1 &2025095657 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2025095658} + - component: {fileID: 2025095660} + - component: {fileID: 2025095659} + m_Layer: 0 + m_Name: "\u63D0\u5355\u53F7" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2025095658 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025095657} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1823661507} + m_Father: {fileID: 1861333842} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -593.4, y: 337} + m_SizeDelta: {x: 52.5, y: 30} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &2025095659 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025095657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u63D0\u5355\u53F7" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 7189cdc95f54eb84ba6a7b8655aebb40, type: 2} + m_sharedMaterial: {fileID: 1594732787684875815, guid: 7189cdc95f54eb84ba6a7b8655aebb40, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 2 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2025095660 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2025095657} + m_CullTransparentMesh: 1 +--- !u!1 &2039329790 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039329791} + - component: {fileID: 2039329793} + - component: {fileID: 2039329792} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2039329791 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039329790} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 917565979} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2039329792 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039329790} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\u200B" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 39d48bca937920746ae0cfa602467f63, type: 2} + m_sharedMaterial: {fileID: 3298889249665915115, guid: 39d48bca937920746ae0cfa602467f63, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 14 + m_fontSizeBase: 14 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 1 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2039329793 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039329790} + m_CullTransparentMesh: 1 --- !u!1 &2041808795 GameObject: m_ObjectHideFlags: 0 @@ -21367,7 +22166,7 @@ RectTransform: m_Children: - {fileID: 2127202496} m_Father: {fileID: 1861333842} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs index aa62fd35..3f1f9f89 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/CameraCtrl/CameraMove.cs @@ -84,7 +84,7 @@ public class CameraMove : CameraController lostFocus = false; return; } - horizontal += UtilityInput.MouseMoveX; + horizontal -= UtilityInput.MouseMoveX; vertical -= UtilityInput.MouseMoveY; vertical = Mathf.Clamp(vertical, -90, 90); diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/CustomUI/CustomGroupButton.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/CustomUI/CustomGroupButton.cs index e07c6ad2..8c06da66 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/CustomUI/CustomGroupButton.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/CustomUI/CustomGroupButton.cs @@ -117,7 +117,8 @@ public class CustomGroupButton : Button }); } - base.OnPointerClick(eventData); + if(eventData!=null) + base.OnPointerClick(eventData); } diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs index 6391663f..cf555c95 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs @@ -66,6 +66,11 @@ public class ApiManager : Singleton /// public List T_BAS_ELEC_WEIGHTER_List { get; set; } = new List(); + /// + /// 企业信息 + /// + public T_BAS_CORPORATION T_BAS_CORPORATION { get; set; } = new T_BAS_CORPORATION(); + public delegate void OnDataUpdate(string _Rt_belt_list); /// /// 皮带秤实时书记更新 @@ -118,59 +123,75 @@ public class ApiManager : Singleton var _api_dic_url = Path.Combine(Application.streamingAssetsPath, "configure_api.json"); - StartCoroutine(RequestBase.Get(_api_dic_url, (_data, _error) => - { - if (_error != null) - { - Debug.Log($"本地api配置错误： {_error} "); - } - else - { - Debug.Log("读取api文件完成"); - ApiDic = JsonConvert.DeserializeObject>(_data); - } - })); + ApiDic = JsonConvert.DeserializeObject>(File.ReadAllText(_api_dic_url)); + Debug.Log("读取api文件完成"); + + //StartCoroutine(RequestBase.Get(_api_dic_url, (_data, _error) => + // { + // if (_error != null) + // { + // Debug.Log($"本地api配置错误： {_error} "); + // } + // else + // { + // Debug.Log("读取api文件完成"); + // ApiDic = JsonConvert.DeserializeObject>(_data); + // } + // })); var _cam_dic_url = Path.Combine(Application.streamingAssetsPath, "configure_camera.json"); - StartCoroutine(RequestBase.Get(_cam_dic_url, (_data, _error) => + Debug.Log("读取相机文件完成"); + var _datas = JsonConvert.DeserializeObject>(File.ReadAllText(_cam_dic_url)); + var _camera_data = _datas.Find(x => x.MONITOR_ID == CallForTest.instance.MONITOR_ID); + if (_camera_data != null) { - if (_error != null) - { - Debug.Log($"本地camera配置错误： {_error} "); - } - else - { - Debug.Log("读取相机文件完成"); - var _datas = JsonConvert.DeserializeObject>(_data); - var _camera_data = _datas.Find(x => x.MONITOR_ID == CallForTest.instance.MONITOR_ID); - if (_camera_data != null) - { - CameraDic = _camera_data.DATA; - } - //CameraDic = JsonConvert.DeserializeObject>(_data); - } - })); + CameraDic = _camera_data.DATA; + } + + //StartCoroutine(RequestBase.Get(_cam_dic_url, (_data, _error) => + //{ + // if (_error != null) + // { + // Debug.Log($"本地camera配置错误： {_error} "); + // } + // else + // { + // Debug.Log("读取相机文件完成"); + // var _datas = JsonConvert.DeserializeObject>(_data); + // var _camera_data = _datas.Find(x => x.MONITOR_ID == CallForTest.instance.MONITOR_ID); + // if (_camera_data != null) + // { + // CameraDic = _camera_data.DATA; + // } + // } + //})); var _yard_dic_url = Path.Combine(Application.streamingAssetsPath, "configure_yard.json"); - StartCoroutine(RequestBase.Get(_yard_dic_url, (_data, _error) => + Debug.Log("读取堆场文件完成"); + var _data2 = JsonConvert.DeserializeObject>(File.ReadAllText(_yard_dic_url)); + var _yard_data = _data2.Find(x => x.MONITOR_ID == CallForTest.instance.MONITOR_ID); + if (_yard_data != null) { - if (_error != null) - { - Debug.Log($"本地yard配置错误： {_error} "); - } - else - { - Debug.Log("读取堆场文件完成"); + YardDic = _yard_data.DATA; + } + //StartCoroutine(RequestBase.Get(_yard_dic_url, (_data, _error) => + //{ + // if (_error != null) + // { + // Debug.Log($"本地yard配置错误： {_error} "); + // } + // else + // { + // Debug.Log("读取堆场文件完成"); + // var _datas = JsonConvert.DeserializeObject>(_data); + // var _yard_data = _datas.Find(x => x.MONITOR_ID == CallForTest.instance.MONITOR_ID); + // if (_yard_data != null) + // { + // YardDic = _yard_data.DATA; + // } + // } + //})); - //YardDic = JsonConvert.DeserializeObject>(_data); - var _datas = JsonConvert.DeserializeObject>(_data); - var _yard_data = _datas.Find(x => x.MONITOR_ID == CallForTest.instance.MONITOR_ID); - if (_yard_data != null) - { - YardDic = _yard_data.DATA; - } - } - })); //return; //获取摄像机列表 StartCoroutine(GetCameraList()); @@ -182,6 +203,9 @@ public class ApiManager : Singleton StartCoroutine(GetAllBeltRtValue()); //获取堆场最新堆货量 StartCoroutine(GetYardLastStorage()); + //获取企业信息 + StartCoroutine(GetCorporationInfo()); + } #region 摄像机 @@ -440,6 +464,35 @@ public class ApiManager : Singleton } #endregion + /// + /// 获取企业数据 + /// + /// + IEnumerator GetCorporationInfo() + { + Debug.Log("准备获取企业数据"); + yield return new WaitUntil(() => { return !string.IsNullOrEmpty(IpAddress) && ApiDic.Count > 0; }); + while (true) + { + var _get_corporationinfo = IpAddress + ApiDic["GetCorporationInfo"]; + StartCoroutine(RequestBase.Get(_get_corporationinfo, new Dictionary() { ["monitorId"] = CallForTest.instance.MONITOR_ID }, (_data, _error) => + { + if (_error != null) + { + Debug.Log($"企业接口错误： {_error} "); + } + else + { + Debug.Log("企业信息数据：" + _data); + T_BAS_CORPORATION= JsonConvert.DeserializeObject>(_data).data; + UIRoot.Instance.companName.text = T_BAS_CORPORATION.MONITOR_NAME; + } + })); + yield return new WaitForSeconds(300); + } + } + + /// /// 模糊查询 /// @@ -450,11 +503,12 @@ public class ApiManager : Singleton /// 卸货地 /// /// - public IEnumerator PostCheckYard(string _SHIP_NAME_EN, string _VOYAGE_NO, string _STANDARD_NAME, string _SILO_NAME, Action> _callback) + public IEnumerator PostCheckYard(string _SHIP_NAME_EN, string _VOYAGE_NO, string _STANDARD_NAME, string _SILO_NAME,string _BILL_NO, Action> _callback) { yield return null; var _post_check_yard = IpAddress + ApiDic["PostCheckYard"]; - var _post_data = $"{{ \"MONITOR_ID\": \"{CallForTest.instance.MONITOR_ID}\",\"SHIP_NAME_EN\": \"{_SHIP_NAME_EN}\",\"VOYAGE_NO\": \"{_VOYAGE_NO}\",\"STANDARD_NAME\": \"{_STANDARD_NAME}\",\"SILO_NAME\":\"{_SILO_NAME}\"}}"; + //var _post_data = $"{{ \"MONITOR_ID\": \"{CallForTest.instance.MONITOR_ID}\",\"SHIP_NAME_EN\": \"{_SHIP_NAME_EN}\",\"VOYAGE_NO\": \"{_VOYAGE_NO}\",\"STANDARD_NAME\": \"{_STANDARD_NAME}\",\"SILO_NAME\":\"{_SILO_NAME}\"}}"; + var _post_data = JsonConvert.SerializeObject(new { MONITOR_ID = CallForTest.instance.MONITOR_ID, SHIP_NAME_EN = _SHIP_NAME_EN, VOYAGE_NO = _VOYAGE_NO, STANDARD_NAME = _STANDARD_NAME, SILO_NAME = _SILO_NAME, BILL_NO = _BILL_NO }); StartCoroutine(RequestBase.Post(_post_check_yard, _post_data, (_data, _error) => { if (_error != null) diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs index b2d6b48b..70d06ad3 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs @@ -28,6 +28,10 @@ public class UIManager : Singleton /// 搜素-商品名称 /// string m_SearchGoodsName; + /// + /// 搜素-提单号 + /// + string m_BillNo; /// /// 搜索结果 @@ -43,6 +47,7 @@ public class UIManager : Singleton UIRoot.Instance.VoyageInputField.onValueChanged.AddListener(InputVoyage); UIRoot.Instance.DischargeLocationInputField.onValueChanged.AddListener(InputDischargeLocation); UIRoot.Instance.GoodsNameInputField.onValueChanged.AddListener(InputGoodsName); + UIRoot.Instance.BillOfLadingInputField.onValueChanged.AddListener(InputBillOfLoadingNo); UIRoot.Instance.SearchButton.onClick.AddListener(Search); UIRoot.Instance.ClearSearchButton.onClick.AddListener(ClaerSearch); @@ -54,6 +59,8 @@ public class UIManager : Singleton UIRoot.Instance.ExitData.onClick.AddListener(ShowHomePageData); ApiManager.Instance.m_OnRtBeltUpdate += RtBeltValueApply; + + UIRoot.Instance.companName.text = ""; } /// @@ -106,6 +113,15 @@ public class UIManager : Singleton m_SearchGoodsName = _goods_name; } + /// + /// 输入提单号 + /// + /// + void InputBillOfLoadingNo(string _tiDan_no) + { + m_BillNo = _tiDan_no; + } + /// /// 搜索按钮 /// @@ -113,7 +129,7 @@ public class UIManager : Singleton { ClaerSearch(false); //搜索场景内的物体，并高亮展示 - StartCoroutine(ApiManager.Instance.PostCheckYard(_SHIP_NAME_EN: m_SearchShipName, _VOYAGE_NO: m_SearchVoyage, _STANDARD_NAME: m_SearchGoodsName, _SILO_NAME: m_SearchDischargeLocation, (_T_BAS_SILO_List) => + StartCoroutine(ApiManager.Instance.PostCheckYard(_SHIP_NAME_EN: m_SearchShipName, _VOYAGE_NO: m_SearchVoyage, _STANDARD_NAME: m_SearchGoodsName, _SILO_NAME: m_SearchDischargeLocation,_BILL_NO:m_BillNo, (_T_BAS_SILO_List) => { for (int i = 0; i < _T_BAS_SILO_List.Count; i++) { @@ -152,6 +168,7 @@ public class UIManager : Singleton UIRoot.Instance.VoyageInputField.text = ""; UIRoot.Instance.DischargeLocationInputField.text = ""; UIRoot.Instance.GoodsNameInputField.text = ""; + UIRoot.Instance.BillOfLadingInputField.text = ""; } //同时清空场景中的高亮 diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIRoot.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIRoot.cs index 0c50ea45..8fd0bceb 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIRoot.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIRoot.cs @@ -25,6 +25,11 @@ public class UIRoot : UITool /// public TextMeshProUGUI Time_HHmmss; + /// + /// 企业名称 + /// + public TextMeshProUGUI companName; + /// /// 自动漫游按钮 /// @@ -47,6 +52,10 @@ public class UIRoot : UITool /// public TMP_InputField GoodsNameInputField; /// + /// 提单号搜索输入框 + /// + public TMP_InputField BillOfLadingInputField; + /// /// 搜索按钮 /// public Button SearchButton; diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs index 7c417942..8a0eff8e 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs @@ -243,6 +243,7 @@ public class MeasuringScale : PanelBase { CDPage.gameObject.SetActive(true); MSPage.gameObject.SetActive(false); + ChartToggle.isOn = true; PickTime(false); }); @@ -344,6 +345,26 @@ public class MeasuringScale : PanelBase FactoryDate.text = _T_BAS_ELEC_WEIGHTER.FACTORY_DATE.ToString(); Purpose.text = ((Purpose)int.Parse(_T_BAS_ELEC_WEIGHTER.WEIGHTER_TYPE.ToString())).ToString(); + //打开计量秤信息 + MeasureScaleButton.transform.GetComponent().OnPointerClick(null); + MSPage.gameObject.SetActive(true); + CDPage.gameObject.SetActive(false); + PickTime(false); + + //图形展示 + ChartToggle.isOn = true; + LineChart.gameObject.SetActive(true); + Table.gameObject.SetActive(false); + + //默认时间 + var _hour = DateTime.Parse($"{DateTime.Now.Hour.ToString()}:00:00"); + StartTime_Day.text = DateTime.Now.AddDays(-1).ToString("yyyy-MM-dd"); + StartTime_Hour.text = $"{DateTime.Now.Hour.ToString()}:00:00"; + EndTime_Day.text = DateTime.Now.ToString("yyyy-MM-dd"); + EndTime_Hour.text = $"{DateTime.Now.Hour.ToString()}:00:00"; + ApplyHistoryData(); + + MeasuringScaleNO_RealTime.text = _T_BAS_ELEC_WEIGHTER.WEIGHTER_NAME; StartCoroutine(ApiManager.Instance.GetMeasureScaleRealTimeData(_T_BAS_ELEC_WEIGHTER.PIPE_CODE, (_T_ALM_PIPECOLLDATA) => { diff --git a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs index de13429c..1f963292 100644 --- a/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs +++ b/BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/VideoPage/VideoWebPage.cs @@ -102,7 +102,7 @@ public class VideoWebPage : PanelBase { if (_error != null) { - Debug.Log($"模糊查询接口错误： {_error} "); + Debug.Log($"获取监控流地址失败： {_error} "); } else { diff --git a/BulkCargo_UnityProject/Assets/StreamingAssets/configure_camera.json b/BulkCargo_UnityProject/Assets/StreamingAssets/configure_camera.json index 4ffa8a1a..bcc6cece 100644 --- a/BulkCargo_UnityProject/Assets/StreamingAssets/configure_camera.json +++ b/BulkCargo_UnityProject/Assets/StreamingAssets/configure_camera.json @@ -5,8 +5,8 @@ "01": "Camera000591", "02": "Camera000592", "03": "Camera000593", - "04": "", - "05": "", + "04": "Camera000101", + "05": "Camera000102", "06": "", "07": "", "08": "",