diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index b4bdbdd..77583dd 100644 Binary files a/Assets/ArtRes/Excel/Config.xlsx and b/Assets/ArtRes/Excel/Config.xlsx differ diff --git a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab index 1b448dc..44ac3be 100644 --- a/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_MenuBar.prefab @@ -1932,6 +1932,9 @@ MonoBehaviour: workOrderName: "\u5DE5\u4F5C\u7968\u6309\u94AE" disassemblyAssemblyWorkOrderName: "\u62C6\u88C5\u5DE5\u5355\u6309\u94AE" toolKitName: "\u80CC\u5305\u6309\u94AE" + siteName: "\u73B0\u573A\u6309\u94AE" + officeName: "\u529E\u516C\u5BA4\u6309\u94AE" + toolRoomName: "\u5DE5\u5177\u95F4\u6309\u94AE" --- !u!1 &7034408565425647768 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/UI/UI_Panel/UI_SelectWorkTicketPanel.prefab b/Assets/Resources/UI/UI_Panel/UI_SelectWorkTicketPanel.prefab index 3cd399a..86eb5c1 100644 --- a/Assets/Resources/UI/UI_Panel/UI_SelectWorkTicketPanel.prefab +++ b/Assets/Resources/UI/UI_Panel/UI_SelectWorkTicketPanel.prefab @@ -377,7 +377,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5391260472701243106} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -709,7 +709,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5391260472643553055} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1559,7 +1559,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5391260472643553055} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -2265,7 +2265,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5391260472487170535} toggleTransition: 1 graphic: {fileID: 5391260471881901913} m_Group: {fileID: 5391260471604481217} @@ -2844,7 +2844,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5391260472379544040} toggleTransition: 1 graphic: {fileID: 5391260471364709866} m_Group: {fileID: 5391260471604481217} @@ -3212,7 +3212,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5391260471676390767} toggleTransition: 1 graphic: {fileID: 5391260471356559784} m_Group: {fileID: 5391260471604481217} @@ -3386,7 +3386,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5391260471742294954} toggleTransition: 1 graphic: {fileID: 5391260470746999414} m_Group: {fileID: 5391260471604481217} @@ -3635,8 +3635,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5391260471402660544} - {fileID: 5391260470960890351} + - {fileID: 5391260471402660544} - {fileID: 5391260470740034712} - {fileID: 5391260471030653846} m_Father: {fileID: 5391260471604481223} @@ -3695,7 +3695,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5391260470960890344} toggleTransition: 1 graphic: {fileID: 5391260471402660545} m_Group: {fileID: 5391260471604481217} @@ -3733,8 +3733,8 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5391260472763218954} - {fileID: 5391260470848089584} + - {fileID: 5391260472763218954} - {fileID: 5391260470934551261} - {fileID: 5391260471152544378} m_Father: {fileID: 5391260471604481223} @@ -3793,7 +3793,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 5391260470848089585} toggleTransition: 1 graphic: {fileID: 5391260472763218955} m_Group: {fileID: 5391260471604481217} @@ -3832,7 +3832,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5391260472701243106} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} diff --git a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs index 07d50ff..172d6e2 100644 --- a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs +++ b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs @@ -150,4 +150,18 @@ public class PacksackBagMgr : BaseManager wearDic.Remove(itemInfo.toolName); } } + /// + /// 宸茬粡绌夸笂 + /// + /// + public bool IsWeared(HashSet wears) + { + HashSet keys = new HashSet(wearDic.Keys); + foreach (var str in keys) + { + wears.RemoveWhere(key => str.Contains(key)); + } + return wears.Count == 0; + } + } \ No newline at end of file diff --git a/Assets/Scripts/Project/Manager/TooRoomMannger.cs b/Assets/Scripts/Project/Manager/TooRoomMannger.cs index 540a686..b785615 100644 --- a/Assets/Scripts/Project/Manager/TooRoomMannger.cs +++ b/Assets/Scripts/Project/Manager/TooRoomMannger.cs @@ -55,7 +55,11 @@ public class TooRoomMannger : SingletonMono } } - + /// + /// 与模型联动 + /// + /// + /// public void Wear(string equipName, bool isChange) { Material ma = null; diff --git a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs index 0c2592f..922e381 100644 --- a/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs +++ b/Assets/Scripts/Project/UI/UI_Item/UI_CheckMyselfItem.cs @@ -10,6 +10,7 @@ public class UI_CheckMyselfItem : BaseItem public ItemInfo itemInfo; public TextMeshProUGUI tips; public bool isOn = false; + public void Init(ItemInfo _itemInfo) { itemInfo = _itemInfo; @@ -20,7 +21,6 @@ public class UI_CheckMyselfItem : BaseItem } GetControl("iconBtn").sprite = Resources.Load(Const.LoadToolAndMaterialPath + _itemInfo.toolName); } - protected override void OnClick(string btnName) { base.OnClick(btnName); @@ -34,7 +34,8 @@ public class UI_CheckMyselfItem : BaseItem PacksackBagMgr.Instance.WearItemState(itemInfo, isOn); TooRoomMannger.Instance.Wear(itemInfo.toolName, isOn); } - Debug.Log("IconBtn"); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + GameManager.EventMgr.EventTrigger(Enum_EventType.WearState); break; case "UI_CheckMyselfItem": Debug.Log("UI_CheckMyselfItem"); diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs index ef2a0e4..9b912b4 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_CheckMyselfPanel.cs @@ -1,20 +1,23 @@ +using System.Collections.Generic; using System.Linq; using UnityEngine; using UnityEngine.UI; public class UI_CheckMyselfPanel : BasePanel { - private string[] validToolNames = { "国网安全帽", "绝缘手套", "绝缘靴", "工作服" }; + private HashSet validToolNames = new HashSet { "国网安全帽", "绝缘手套", "绝缘靴", "工作服" }; public RectTransform _content; public UI_CheckMyselfItem ui_CheckMySelfItem; - public void Init() - { - - } public override void ShowMe() { + base.ShowMe(); + if (GameManager.RunModelMgr.ModeType == E_ModeType.Study) + { + GetControl