提交日志-20240703-2332：

1、优化 【腾讯文档】散货问题修复 https://docs.qq.com/sheet/DT095c21TZ05NcXNo B0041

BulkCargo_UnityProject/Assets/Resources/Prefabs/UI/DeviceIcons/YardNameIcon.prefab

@@ -60,7 +60,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -199,7 +199,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -241,4 +241,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: af498aa5614b7e047a8f4fe18e5327c8, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  DeviceBase: {fileID: 0}
+  DeviceIndex: 
   DeviceNameText: {fileID: 6367114157914357126}

BulkCargo_UnityProject/Assets/Scenes/福州海关/蓉城海关/华能（福建）海港有限公司海关监管场所.unity

@@ -6086,6 +6086,7 @@ MonoBehaviour:
   YardMaxWeight: 60000000
   MinimumPercentage: 0.1
   ParticleSystem: {fileID: 0}
+  NameIconOffset: {x: 0, y: 0, z: -75}
 --- !u!65 &271908282
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -6231,6 +6232,7 @@ MonoBehaviour:
   YardMaxWeight: 60000000
   MinimumPercentage: 0.1
   ParticleSystem: {fileID: 0}
+  NameIconOffset: {x: 0, y: 0, z: 0}
 --- !u!65 &341412933
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -12042,6 +12044,7 @@ MonoBehaviour:
   YardMaxWeight: 80000000
   MinimumPercentage: 0.1
   ParticleSystem: {fileID: 0}
+  NameIconOffset: {x: 0, y: 0, z: 0}
 --- !u!65 &507878043
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -12918,6 +12921,7 @@ MonoBehaviour:
   YardMaxWeight: 80000000
   MinimumPercentage: 0.1
   ParticleSystem: {fileID: 0}
+  NameIconOffset: {x: 0, y: 0, z: -75}
 --- !u!65 &690684754
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -13137,6 +13141,7 @@ MonoBehaviour:
   YardMaxWeight: 80000000
   MinimumPercentage: 0.1
   ParticleSystem: {fileID: 0}
+  NameIconOffset: {x: 0, y: 0, z: 75}
 --- !u!65 &717536052
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -20403,6 +20408,7 @@ MonoBehaviour:
   YardMaxWeight: 80000000
   MinimumPercentage: 0.1
   ParticleSystem: {fileID: 0}
+  NameIconOffset: {x: 0, y: 0, z: 75}
 --- !u!65 &1185296017
 BoxCollider:
   m_ObjectHideFlags: 0

BulkCargo_UnityProject/Assets/Scripts/wj/Device/YardDevice.cs

@@ -72,6 +72,11 @@ public class YardDevice : DeviceBase
     /// </summary>
     DeviceName DeviceName;
 
+    /// <summary>
+    /// 堆区名称展示坐标偏移量
+    /// </summary>
+    public Vector3 NameIconOffset;
+
     public override void Awake()
     {
         base.Awake();
@@ -210,27 +215,27 @@ public class YardDevice : DeviceBase
             ParticleSystem.Play();
 
             //չʾ¶Ñ³¡Ãû³Æ
-            DeviceName = ObjectPool<DeviceName>.Get();
+            //DeviceName = ObjectPool<DeviceName>.Get();
-            if (DeviceName == null)
+            //if (DeviceName == null)
-            {
+            //{
-                DeviceName = Instantiate(Resources.Load<DeviceName>("Prefabs/UI/DeviceIcons/YardNameIcon"));
+            //    DeviceName = Instantiate(Resources.Load<DeviceName>("Prefabs/UI/DeviceIcons/YardNameIcon"));
-                DeviceName.transform.parent = ModelRoot.Instance.Canvas_3D;
+            //    DeviceName.transform.parent = ModelRoot.Instance.Canvas_3D;
 
-                DeviceName.transform.position = transform.position;
+            //    DeviceName.transform.position = transform.position;
-                DeviceName.NameText(T_BAS_YARD.YARD_NAME);
+            //    DeviceName.NameText(T_BAS_YARD.YARD_NAME);
-            }
+            //}
-            else
+            //else
-            {
+            //{
-                DeviceName.transform.position = transform.position;
+            //    DeviceName.transform.position = transform.position;
-                DeviceName.NameText(T_BAS_YARD.YARD_NAME);
+            //    DeviceName.NameText(T_BAS_YARD.YARD_NAME);
-            }
+            //}
         }
         else
         {
             ParticleSystem.Stop(true, ParticleSystemStopBehavior.StopEmittingAndClear);
 
             //Òþ²Ø¶Ñ³¡Ãû³Æ
-            ObjectPool<DeviceName>.Store(DeviceName);
+            //ObjectPool<DeviceName>.Store(DeviceName);
         }
     }
 

BulkCargo_UnityProject/Assets/Scripts/wj/Manager/MainScene.cs

@@ -76,6 +76,14 @@ public class MainScene : Singleton<MainScene>
                     //var _yard_icon = Instantiate(ModelRoot.Instance.YardIconPrefab, ModelRoot.Instance.Canvas_3D);
                     //_yard_icon.transform.position = DeviceBase.DeviceBaseList[i].transform.position;
                     //_yard_icon.GetComponent<DeviceUIBase>().InitModel(DeviceBase.DeviceBaseList[i]);
+                    if (ModelRoot.Instance.YardNameIcon == null)
+                    {
+                        ModelRoot.Instance.YardNameIcon = Resources.Load("Prefabs/UI/DeviceIcons/YardNameIcon") as GameObject;
+                    }
+                    var _yard = DeviceBase.DeviceBaseList[i] as YardDevice;
+                    var _yard_icon = Instantiate(ModelRoot.Instance.YardNameIcon, ModelRoot.Instance.Canvas_3D);
+                    _yard_icon.transform.position = _yard.transform.position + _yard.NameIconOffset;
+                    _yard_icon.GetComponent<DeviceUIBase>().InitModel(DeviceBase.DeviceBaseList[i]);
                     break;
                 default:
                     break;

BulkCargo_UnityProject/Assets/Scripts/wj/Manager/ModelRoot.cs

@@ -31,6 +31,10 @@ public class ModelRoot : Singleton<ModelRoot>
     ///Ô¤ÖÆÌå-¶Ñ³¡UIͼ±ê
     /// </summary>
     public GameObject YardIconPrefab;
+    /// <summary>
+    /// 预制体-堆场名称图标
+    /// </summary>
+    public GameObject YardNameIcon;
 
     public override void Awake()
     {

BulkCargo_UnityProject/Assets/Scripts/wj/Manager/UIManager.cs

@@ -129,7 +129,9 @@ public class UIManager : Singleton<UIManager>
             }
         }));
     }
-
+    /// <summary>
+    /// 헌왕鎧乞
+    /// </summary>
     void ClaerSearch()
     {
         ClaerSearch(true);

BulkCargo_UnityProject/Assets/Scripts/wj/UI/DeviceName.cs

@@ -1,9 +1,10 @@
+using Competition.Mysql.Model;
 using System.Collections;
 using System.Collections.Generic;
 using TMPro;
 using UnityEngine;
 
-public class DeviceName : MonoBehaviour
+public class DeviceName : DeviceUIBase
 {
     [SerializeField]
     private TextMeshProUGUI DeviceNameText;
@@ -12,4 +13,11 @@ public class DeviceName : MonoBehaviour
     {
         DeviceNameText.text = _name;
     }
+
+    public override void InitData()
+    {
+        base.InitData();
+
+        NameText(DeviceBase.T_BAS_YARD.YARD_NAME);
+    }
 }