diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index 77583dd..05e3c66 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Scripts/Project/Manager/LiveSceneManager.cs b/Assets/Scripts/Project/Manager/LiveSceneManager.cs index bb27c25..8251d16 100644 --- a/Assets/Scripts/Project/Manager/LiveSceneManager.cs +++ b/Assets/Scripts/Project/Manager/LiveSceneManager.cs @@ -10,7 +10,7 @@ public class LiveSceneManager : SingletonMono public GameObject currentTool; public Transform spawnToolPos; public Transform tMDTips; - + protected override void Awake() { base.Awake(); @@ -28,7 +28,11 @@ public class LiveSceneManager : SingletonMono { GameManager.UIMgr.ShowPanel(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); diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs index 9cd6974..d924c6c 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs +++ b/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(); GameObject currentTool = Instantiate(currentItem.objPrefab); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs index aefad34..3336cdd 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_ToolAndMaterialPanel.cs +++ b/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