chenxiangxue
/
FuZhou_Custom_BulkCargo_3D
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交日志-20240702-1506： 

1、【腾讯文档】散货0628问题修复https://docs.qq.com/sheet/DT095c21TZ05NcXNo 优化7.2
2、模糊查询参数，卸货地SILO_CODE改成SILO_NAME
This commit is contained in:
Afeijia 2024-07-02 15:05:56 +08:00
parent 9bde928578
commit a921681c00
8 changed files with 2025 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
BulkCargo_UnityProject/Assets/Fonts/UIFont/SourceHanSansCN-Heavy SDF.asset
View File

File diff suppressed because one or more lines are too long

1816
BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/MeasuringScaleInfo/MeasuringScale.prefab
View File

File diff suppressed because it is too large Load Diff

151
BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/YardInfo/YardInformation.prefab
View File

@ -316,7 +316,7 @@ RectTransform:
- {fileID: 8743207626181280594}
- {fileID: 8743207626996508249}
m_Father: {fileID: 8743207625565546792}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@ -629,6 +629,142 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2478904650334318531
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5192146994689258697}
- component: {fileID: 3195179212096044910}
- component: {fileID: 3725769161834486547}
m_Layer: 0
m_Name: Text (TMP) (11)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5192146994689258697
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2478904650334318531}
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: 8743207625565546792}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 86, y: -85.2}
m_SizeDelta: {x: 80, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3195179212096044910
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2478904650334318531}
m_CullTransparentMesh: 1
--- !u!114 &3725769161834486547
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2478904650334318531}
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: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u8D27\u7269\u5B58\u50A8\u4FE1\u606F"
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: 13
m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 2
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: -15
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!1 &2851630424632914755
GameObject:
m_ObjectHideFlags: 0
@ -1024,7 +1160,7 @@ RectTransform:
- {fileID: 8743207627178484732}
- {fileID: 1399166639746301904}
m_Father: {fileID: 8743207625565546792}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
@ -1263,6 +1399,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 5192146994689258697}
- {fileID: 1745132538386556395}
- {fileID: 8743207625355349580}
m_Father: {fileID: 8743207627075719638}
@ -1617,7 +1754,7 @@ RectTransform:
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: -321, y: 197}
m_AnchoredPosition: {x: -321, y: 203.90002}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8743207625841885624
@ -1822,7 +1959,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u4E00\u6B21\u8D38\u6613\\n\u5DF2\u653E\u884C\u91CF"
m_text: "\u4E00\u822C\u8D38\u6613\\n\u5DF2\u653E\u884C\u91CF"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7189cdc95f54eb84ba6a7b8655aebb40, type: 2}
m_sharedMaterial: {fileID: 1594732787684875815, guid: 7189cdc95f54eb84ba6a7b8655aebb40,
@ -2406,7 +2543,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: "\u4E00\u6B21\u8D38\u6613\\n\u672A\u653E\u884C\u91CF"
m_text: "\u4E00\u822C\u8D38\u6613\\n\u672A\u653E\u884C\u91CF"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 7189cdc95f54eb84ba6a7b8655aebb40, type: 2}
m_sharedMaterial: {fileID: 1594732787684875815, guid: 7189cdc95f54eb84ba6a7b8655aebb40,
@ -2511,7 +2648,7 @@ RectTransform:
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: -134, y: 234}
m_AnchoredPosition: {x: -134, y: 240.90002}
m_SizeDelta: {x: 180, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8743207626608398829
@ -2647,7 +2784,7 @@ RectTransform:
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: -436, y: 234}
m_AnchoredPosition: {x: -436, y: 240.9}
m_SizeDelta: {x: 180, y: 30}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8743207626849403871

4
BulkCargo_UnityProject/Assets/Scripts/ObjectPool.cs
View File

@ -21,6 +21,10 @@ public class ObjectPool<T>
public static void Store(T _t)
{
if (_t == null)
{
return;
}
if (!Pool.ContainsKey(typeof(T)))
{
Pool.Add(typeof(T), new Queue<T>());

10
BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ApiManager.cs
View File

@ -385,12 +385,18 @@ public class ApiManager : Singleton<ApiManager>
/// <summary>
/// Ä£ºý²éѯ
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="_SHIP_NAME_EN">摒靡</param>
/// <param name="_VOYAGE_NO">瑤棒</param>
/// <param name="_STANDARD_NAME">妀ⅲ靡備</param>
/// <param name="_SILO_NAME">迠億華</param>
/// <param name="_callback"></param>
/// <returns></returns>
public IEnumerator PostCheckYard<T>(string _SHIP_NAME_EN, string _VOYAGE_NO, string _STANDARD_NAME, string _SILO_CODE, Action<List<T>> _callback)
public IEnumerator PostCheckYard<T>(string _SHIP_NAME_EN, string _VOYAGE_NO, string _STANDARD_NAME, string _SILO_NAME, Action<List<T>> _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\": \"{_SHIP_NAME_EN}\",\"SILO_CODE\":\"{_SILO_CODE}\"}}";
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}\"}}";
StartCoroutine(RequestBase.Post(_post_check_yard, _post_data, (_data, _error) =>
{
if (_error != null)

2
BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs
View File

@ -109,7 +109,7 @@ public class UIManager : Singleton<UIManager>
{
ClaerSearch(false);
//搜索场景内的物体，并高亮展示
StartCoroutine(ApiManager.Instance.PostCheckYard<T_BAS_SILO>(_SHIP_NAME_EN: m_SearchShipName, _VOYAGE_NO: m_SearchVoyage, _STANDARD_NAME: m_SearchGoodsName, _SILO_CODE: m_SearchDischargeLocation, (_T_BAS_SILO_List) =>
StartCoroutine(ApiManager.Instance.PostCheckYard<T_BAS_SILO>(_SHIP_NAME_EN: m_SearchShipName, _VOYAGE_NO: m_SearchVoyage, _STANDARD_NAME: m_SearchGoodsName, _SILO_NAME: m_SearchDischargeLocation, (_T_BAS_SILO_List) =>
{
for (int i = 0; i < _T_BAS_SILO_List.Count; i++)
{

9
BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/MeasuringScale/MeasuringScale.cs
View File

@ -298,6 +298,15 @@ public class MeasuringScale : PanelBase
PickTime(false);
}
/// <summary>
/// ³õʼ»¯Í¼±ê
/// </summary>
public void InitChart()
{
Tooltip tooltip = LineChart.EnsureChartComponent<Tooltip>();
//tooltip.
}
/// <summary>
/// 选择时间面板启用/关闭
/// </summary>

4
BulkCargo_UnityProject/Assets/Scripts/wj/Table&Chart/Yard/YardInformation.cs
View File

@ -89,8 +89,8 @@ public class YardInformation : PanelBase
for (int i = 0; i < _storage_list.Count; i++)
{
//过滤库存剩余量为0的数据
if (float.Parse(_storage_list[i].STOCK_BALANCE.ToString()) == 0)
//过滤库存剩余量小于等于0的数据
if (float.Parse(_storage_list[i].STOCK_BALANCE.ToString()) <= 0)
{
continue;
}