Merge branch 'main' of http://172.16.1.12/WangWeiZhi/YanCheng_Metrology

Assets/Scripts/Project/Manager/LiveSceneManager.cs

@@ -28,7 +28,11 @@ public class LiveSceneManager : SingletonMono<LiveSceneManager>
         {
             GameManager.UIMgr.ShowPanel<UI_PlayerSessionPanel>(E_UI_Layer.Mid, (p) =>
             {
-                p.Init("", "您好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户更换电能计量表", (intTemp) => { Destroy(currentTool); });
+                p.Init(currentTool.name, "您好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户更换电能计量表", (intTemp) =>
+                {
+                    GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(intTemp, true);
+                    Destroy(currentTool);
+                });
             });
             tMDTips.gameObject.SetActive(false);
             currentTool.transform.localEulerAngles = new Vector3(90, 0, 0);

Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs

@@ -49,7 +49,8 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
                     Destroy(gameObject);
                 break;
             case "iconBtn":
-                if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, true) == 0)
+                bool isWorkCard = currentItem.toolName.Equals("¹¤×÷Ö¤") ? false : true; 
+                if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, isWorkCard) == 0)
                 {
                     GameManager.UIMgr.HidePanel<UI_ToolAndMaterialPanel>();
                     GameObject currentTool = Instantiate(currentItem.objPrefab);

Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs

@@ -8,21 +8,16 @@ public class UI_ToolAndMaterialPanel : BasePanel
     public RectTransform _content;
     public UI_ToolOrMaterialsOrDeviceItem ui_TmdItem;
 
-    public void Init()
-    {
-
-    }
 
 
     public override void ShowMe()
     {
+        if (GameManager.RunModelMgr.ModeType == E_ModeType.Study)
+            GetControl<Button>("closeBtn").interactable = false;
         CreatItem(E_ToolOrDeviceOrMaterials.Tool); //默认打开显示工器具
     }
 
-    public override void HideMe()
-    {
    
-    }
 
 
     private void CreatItem(E_ToolOrDeviceOrMaterials tmdTpye)