From 227657da5cc536cc6feafcab0d02b1736160d09b Mon Sep 17 00:00:00 2001 From: YangHua <1475658476@qq.com> Date: Tue, 27 Aug 2024 13:12:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ArtRes/Excel/Config.xlsx | Bin 22134 -> 22274 bytes .../Resources/UI/UI_Panel/UI_MenuBar.prefab | 3 + .../UI_Panel/UI_SelectWorkTicketPanel.prefab | 24 ++--- .../Scripts/Project/Manager/PacksackBagMgr.cs | 14 +++ .../Scripts/Project/Manager/TooRoomMannger.cs | 6 +- .../Project/UI/UI_Item/UI_CheckMyselfItem.cs | 5 +- .../UI/UI_Panel/UI_CheckMyselfPanel.cs | 25 ++++- .../UI_InstallAndDismantleTicketPanel.cs | 7 +- .../UI_Panel/UI_LowTensionWorkTicketPanel.cs | 16 +-- .../Scripts/Project/UI/UI_Panel/UI_MenuBar.cs | 39 ++++++- .../UI/UI_Panel/UI_SelectWorkTicketPanel.cs | 98 +++++++++--------- .../ProjectBase/EventCenter/Enum_EventType.cs | 4 + .../BinaryData/TB_SubProcessStep.binary | Bin 4168 -> 4343 bytes Assets/WorkingLineNameOrEquipmentDualName.cs | 1 - 14 files changed, 154 insertions(+), 88 deletions(-) diff --git a/Assets/ArtRes/Excel/Config.xlsx b/Assets/ArtRes/Excel/Config.xlsx index b4bdbddc9ca58ca1f45cbcaccbf0a5f5aea55dc0..77583ddd12d92a5bf4804b23e76474fe96d0ea5a 100644 GIT binary patch delta 7621 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 MI&_F(8vlX(7sWQ25&!@I delta 7502 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 F{|9^$Gf)5k 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