From 5f0c4728da02de621c3e2cdbd281c4212a19f945 Mon Sep 17 00:00:00 2001
From: huqibin <762612145@qq.com>
Date: Mon, 20 Jan 2025 13:52:28 +0800
Subject: [PATCH] 0120

---
 .../10009_9001_04_ToolMaterialScene.unity     | 30 +++++++++++++++++++
 Assets/Scripts/StepState_9001.cs              |  4 +--
 Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml   |  2 --
 .../Scripts/Project/Manager/PacksackBagMgr.cs | 13 --------
 .../UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs | 15 ++++++----
 5 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/Assets/Scenes/10009_9001_04_ToolMaterialScene.unity b/Assets/Scenes/10009_9001_04_ToolMaterialScene.unity
index ce035ee..f2e099d 100644
--- a/Assets/Scenes/10009_9001_04_ToolMaterialScene.unity
+++ b/Assets/Scenes/10009_9001_04_ToolMaterialScene.unity
@@ -8086,6 +8086,8 @@ MonoBehaviour:
     toolOrDeviceOrMaterial: 0
     objPrefab: {fileID: 0}
     selfPosInToolRoom: {x: 0, y: 0, z: 0}
+    selfAngleInToolRoom: {x: 0, y: 0, z: 0}
+    index: 0
   _highlight: {fileID: 0}
 --- !u!65 &1907965720
 BoxCollider:
@@ -8865,6 +8867,34 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5370190688320940380, guid: 906cc253ee10599478864236a349d004, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5370190690016237131, guid: 906cc253ee10599478864236a349d004, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5755307409124852210, guid: 906cc253ee10599478864236a349d004, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6255899804326469815, guid: 906cc253ee10599478864236a349d004, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6846643171150490252, guid: 906cc253ee10599478864236a349d004, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7017702842354808853, guid: 906cc253ee10599478864236a349d004, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7646237617077493431, guid: 906cc253ee10599478864236a349d004, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 4487972598169150845, guid: 906cc253ee10599478864236a349d004, type: 3}
     - {fileID: 6573384303805956468, guid: 906cc253ee10599478864236a349d004, type: 3}
diff --git a/Assets/Scripts/StepState_9001.cs b/Assets/Scripts/StepState_9001.cs
index 8e769f7..2a29b99 100644
--- a/Assets/Scripts/StepState_9001.cs
+++ b/Assets/Scripts/StepState_9001.cs
@@ -41,8 +41,8 @@ public class StepState_9001 : StepState
         if (num == 1)//正确着装
         {
             //办公室场景首个步骤
-            //查看任务单
-            //OfficeManager.Instance.mobileController.downIndex = 0;
+
+            //正确着装
             TooRoomMannger.Instance.CreateTool();
             PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial();
             TooRoomMannger.Instance.CheckWearByWearDic();
diff --git a/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml b/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml
index 869e0c2..53e3f4b 100644
--- a/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml
+++ b/Assets/StreamingAssets/Setting/宸ュ叿鏉愭枡.xml
@@ -32,8 +32,6 @@
   <ToolMaterial id="5029" objName="鏂滃彛閽�" type="0"></ToolMaterial>
   <ToolMaterial id="5030" objName="浣庡帇鐢垫祦浜掓劅鍣�" type="1"></ToolMaterial>
   <ToolMaterial id="5031" objName="鑱斿悎鎺ョ嚎鐩�" type="0"></ToolMaterial>
-  <ToolMaterial id="5032" objName="涓夌浉鍥涚嚎鏅鸿兘鐢佃兘琛�" type="1"></ToolMaterial>
-  <ToolMaterial id="5033" objName="鍥存爮" type="2"></ToolMaterial>
   <ToolMaterial id="5034" objName="閲囬泦鍣�" type="1"></ToolMaterial>
 	<ToolMaterial id="5035" objName="鐩掕璁￠噺绠辩數瀛愭爣绛�" type="0"></ToolMaterial>
 	<ToolMaterial id="5036" objName="缁濈紭閾�" type="0"></ToolMaterial>
diff --git a/Assets/Template/Scripts/Project/Manager/PacksackBagMgr.cs b/Assets/Template/Scripts/Project/Manager/PacksackBagMgr.cs
index ef19276..0e3d367 100644
--- a/Assets/Template/Scripts/Project/Manager/PacksackBagMgr.cs
+++ b/Assets/Template/Scripts/Project/Manager/PacksackBagMgr.cs
@@ -127,19 +127,6 @@ public class PacksackBagMgr : BaseManager<PacksackBagMgr>
     /// </summary>
     public void ClearAllToolAndDiveceAndMaterial()
     {
-        foreach (var item in toolAndMaterialDic.Keys)
-        {
-            List<ItemInfo> temp = toolAndMaterialDic[item];
-            for (int j = 0; j < temp.Count; j++)
-            {
-                int indexJ = j;
-                GameObject obj = GameObject.Instantiate(temp[indexJ].objPrefab);
-                obj.name = temp[indexJ].toolName;
-                obj.transform.position = temp[indexJ].selfPosInToolRoom;
-                obj.GetComponent<Tool_SelectComponent>().itemInfo = temp[indexJ];
-                obj.GetComponent<Tool_SelectComponent>().GetInfo();
-            }
-        }
         ClearAllData();
     }
 
diff --git a/Assets/Template/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs b/Assets/Template/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
index c075f8a..2f21657 100644
--- a/Assets/Template/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
+++ b/Assets/Template/Scripts/Project/UI/UI_Item/UI_ToolOrMaterialsOrDeviceItem.cs
@@ -65,14 +65,17 @@ public class UI_ToolOrMaterialsOrDeviceItem : BaseItem
                     Destroy(gameObject);
                 break;
             case "iconBtn":
-                if(currentItem.toolName == "手机")
+                if (currentItem.toolName == "手机")
                 {
-                    GameManager.UIMgr.HidePanel<UI_ToolAndMaterialPanel>();
-                    GameManager.UIMgr.imageTips.HideTips();
-                    GameManager.UIMgr.ShowPanel<UI_PhonePanel>(E_UI_Layer.Mid, (panel) =>
+                    if (GameManager.ProcessMgr.IsRightSubProcessStepsTriggerID(currentItem.toolName, false) == 0)
                     {
-                        panel.Init("手机", Input.mousePosition);
-                    });
+                        GameManager.UIMgr.HidePanel<UI_ToolAndMaterialPanel>();
+                        GameManager.UIMgr.imageTips.HideTips();
+                        GameManager.UIMgr.ShowPanel<UI_PhonePanel>(E_UI_Layer.Mid, (panel) =>
+                        {
+                            panel.Init("手机", Input.mousePosition);
+                        });
+                    }
                     return;
                 }
                 bool isWorkCard = currentItem.toolName.Equals("工作证") ? false : true;