diff --git a/Assets/Resources/UI/UI_Panel/ItemTips.prefab b/Assets/Resources/UI/UI_Tip/ToolInfoTips.prefab similarity index 96% rename from Assets/Resources/UI/UI_Panel/ItemTips.prefab rename to Assets/Resources/UI/UI_Tip/ToolInfoTips.prefab index c99b046..bc9b459 100644 --- a/Assets/Resources/UI/UI_Panel/ItemTips.prefab +++ b/Assets/Resources/UI/UI_Tip/ToolInfoTips.prefab @@ -168,11 +168,11 @@ RectTransform: m_Father: {fileID: 7369265064053445044} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 52, y: -4} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -17.4} m_SizeDelta: {x: 16, y: 16} - m_Pivot: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &5272243258143008175 CanvasRenderer: m_ObjectHideFlags: 0 @@ -223,7 +223,7 @@ GameObject: - component: {fileID: 9083784722124570545} - component: {fileID: 2296507059249110610} m_Layer: 5 - m_Name: ItemTips + m_Name: ToolInfoTips m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -249,7 +249,7 @@ RectTransform: 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} + m_Pivot: {x: 0.5, y: 0.5068044} --- !u!222 &9083784722124570545 CanvasRenderer: m_ObjectHideFlags: 0 @@ -270,6 +270,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7fd7002edeffb3a408cfac227a769d3d, type: 3} m_Name: m_EditorClassIdentifier: + itemText: {fileID: 66389531985156297} + bg: {fileID: 7369265064053445044} --- !u!1 &7894709409026262177 GameObject: m_ObjectHideFlags: 0 @@ -305,11 +307,11 @@ RectTransform: m_Father: {fileID: 3282513741013345151} m_RootOrder: 0 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: 0, y: 66.74} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 588.74} m_SizeDelta: {x: 120, y: 36} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0.5, y: 0} --- !u!222 &1055551684720532243 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/UI_Panel/ItemTips.prefab.meta b/Assets/Resources/UI/UI_Tip/ToolInfoTips.prefab.meta similarity index 100% rename from Assets/Resources/UI/UI_Panel/ItemTips.prefab.meta rename to Assets/Resources/UI/UI_Tip/ToolInfoTips.prefab.meta diff --git a/Assets/Scripts/Project/Manager/OfficeManager.cs b/Assets/Scripts/Project/Manager/OfficeManager.cs index b441650..538196c 100644 --- a/Assets/Scripts/Project/Manager/OfficeManager.cs +++ b/Assets/Scripts/Project/Manager/OfficeManager.cs @@ -32,12 +32,12 @@ public class OfficeManager : SingletonMono { GameManager.UIMgr.ShowPanel(E_UI_Layer.Mid, (panel) => { - panel.Init($"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.processName}:{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}", $"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.tips}", false); + panel.Init($"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.processName}:{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}", $"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.tips}", false); }); } else { - GameManager.UIMgr.GetPanel().Init($"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.processName}:{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}", $"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.tips}", false); + GameManager.UIMgr.GetPanel().Init($"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.processName}:{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}", $"{GameManager.ProcessMgr.d_Scheme.CurrentProcess.CurrentSubProcess.tips}", false); } } diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs index 5ec146c..4582ebf 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs @@ -9,10 +9,7 @@ public class Tool_SelectComponent : BaseToolOrDevice { base.OnEnter(); Vector3 pos = Camera.main.WorldToScreenPoint(transform.position); - //GameManager.UIMgr.ShowPanel(E_UI_Layer.System, (panel) => - //{ - // panel.Init(gameObject.name, pos); - //}); + GameManager.UIMgr.toolTips.ShowTips(gameObject.name, pos); ///高亮 if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) { @@ -25,17 +22,14 @@ public class Tool_SelectComponent : BaseToolOrDevice if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(itemInfo.toolName, true) == 0) { GameManager.PacksackBagMgr.AddOneToolOrMater(itemInfo); - GameManager.UIMgr.HidePanel();//提示面板 - + GameManager.UIMgr.toolTips.HideTips(); Destroy(gameObject); } } public override void OnExit() { - ///关闭高亮 - //if (GameManager.UIMgr.GetPanel()) - // GameManager.UIMgr.HidePanel();//提示面板 + GameManager.UIMgr.toolTips.HideTips(); base.OnExit(); if (GameManager.RunModelMgr.ModeType != E_ModeType.Study) _highlight.SetHighlighted(false); diff --git a/Assets/Scripts/Project/UI/UI_Panel/ItemTips.cs b/Assets/Scripts/Project/UI/UI_Panel/ItemTips.cs deleted file mode 100644 index 6b9e63e..0000000 --- a/Assets/Scripts/Project/UI/UI_Panel/ItemTips.cs +++ /dev/null @@ -1,12 +0,0 @@ -using UnityEngine.UI; -using TMPro; -using UnityEngine; - -public class ItemTips : BasePanel -{ - public void Init(string Item, Vector3 pos) - { - GetControl("ItemText").text = Item; - GetComponent().position = pos; - } -} \ No newline at end of file diff --git a/Assets/Scripts/Project/UI/UI_Panel/ToolInfoTips.cs b/Assets/Scripts/Project/UI/UI_Panel/ToolInfoTips.cs new file mode 100644 index 0000000..7834623 --- /dev/null +++ b/Assets/Scripts/Project/UI/UI_Panel/ToolInfoTips.cs @@ -0,0 +1,31 @@ +using UnityEngine.UI; +using TMPro; +using UnityEngine; + +public class ToolInfoTips : MonoBehaviour +{ + public TextMeshProUGUI itemText; + public RectTransform bg; + public void ShowTips(string Item, Vector3 pos) + { + gameObject.SetActive(true); + itemText.text = Item; + GetComponent().position = pos; + AdjustImageWidth(itemText); + } + + public void HideTips() + { + gameObject.SetActive(false); + } + /// + /// 根据文字数量改变 背景 大小 + /// + /// + private void AdjustImageWidth(TextMeshProUGUI contentText) + { + float preferredWidth = contentText.preferredWidth; + bg.sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : 30), bg.sizeDelta.y); + contentText.GetComponent().sizeDelta = new Vector2(preferredWidth + (contentText.text == "" ? 0 : 30), 52); + } +} \ No newline at end of file diff --git a/Assets/Scripts/Project/UI/UI_Panel/ItemTips.cs.meta b/Assets/Scripts/Project/UI/UI_Panel/ToolInfoTips.cs.meta similarity index 100% rename from Assets/Scripts/Project/UI/UI_Panel/ItemTips.cs.meta rename to Assets/Scripts/Project/UI/UI_Panel/ToolInfoTips.cs.meta diff --git a/Assets/Scripts/ProjectBase/UIManager/UIManager.cs b/Assets/Scripts/ProjectBase/UIManager/UIManager.cs index 02272db..f720c88 100644 --- a/Assets/Scripts/ProjectBase/UIManager/UIManager.cs +++ b/Assets/Scripts/ProjectBase/UIManager/UIManager.cs @@ -57,6 +57,11 @@ public class UIManager : BaseManager /// public ImageTips imageTipsPrefab; public ImageTips imageTips; + /// + /// 宸ュ叿鎻愮ず棰勫埗浣撳拰瀹炲垪鍖 + /// + public ToolInfoTips toolTipsPrefab; + public ToolInfoTips toolTips; /// /// 鏋勯犲嚱鏁 @@ -69,9 +74,12 @@ public class UIManager : BaseManager mid = canvas.transform.Find("Mid"); top = canvas.transform.Find("Top"); system = canvas.transform.Find("System"); - imageTipsPrefab = ResourcesManager.Instance.Load ("UI/UI_Tip/ImageTips"); + imageTipsPrefab = ResourcesManager.Instance.Load("UI/UI_Tip/ImageTips"); imageTips = GameObject.Instantiate(imageTipsPrefab, canvas); imageTips.HideTips(); + toolTipsPrefab = ResourcesManager.Instance.Load("UI/UI_Tip/ToolInfoTips"); + toolTips = GameObject.Instantiate(toolTipsPrefab, canvas); + toolTips.HideTips(); } ///