From 2b47236a566a97031c179286b0a67f8efbb95005 Mon Sep 17 00:00:00 2001 From: chenxiangxue <910695411@qq.com> Date: Sun, 25 Aug 2024 14:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E9=97=B4=E6=AD=A5=E9=AA=A4?= =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...相四线电表.prefab => 三相四线电能表.prefab} | 2 +- ...表.prefab.meta => 三相四线电能表.prefab.meta} | 0 .../Resources/Prefabs/Objects/步骤状态.prefab | 579 +----------------- Assets/Scenes/03_OfficeScene.unity | 3 +- .../CXX/StepState/1002/StepState_1002.cs | 22 +- .../Scripts/Project/Manager/PacksackBagMgr.cs | 11 +- .../Project/Manager/ToolAndmaterialMgr.cs | 18 +- .../Project/Objects/Other/MobileController.cs | 4 +- .../ToolAndMaterial/Tool_SelectComponent.cs | 1 + 9 files changed, 53 insertions(+), 587 deletions(-) rename Assets/Resources/Prefabs/Objects/Tools/{三相四线电表.prefab => 三相四线电能表.prefab} (99%) rename Assets/Resources/Prefabs/Objects/Tools/{三相四线电表.prefab.meta => 三相四线电能表.prefab.meta} (100%) diff --git a/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab similarity index 99% rename from Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab rename to Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab index 1c9c648..807a21f 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab @@ -6074,7 +6074,7 @@ GameObject: - component: {fileID: 2921358948653541} - component: {fileID: 4834241782207447596} m_Layer: 0 - m_Name: "\u4E09\u76F8\u56DB\u7EBF\u7535\u8868" + m_Name: "\u4E09\u76F8\u56DB\u7EBF\u7535\u80FD\u8868" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab.meta b/Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab.meta similarity index 100% rename from Assets/Resources/Prefabs/Objects/Tools/三相四线电表.prefab.meta rename to Assets/Resources/Prefabs/Objects/Tools/三相四线电能表.prefab.meta diff --git a/Assets/Resources/Prefabs/Objects/步骤状态.prefab b/Assets/Resources/Prefabs/Objects/步骤状态.prefab index ac07c7a..3383cb9 100644 --- a/Assets/Resources/Prefabs/Objects/步骤状态.prefab +++ b/Assets/Resources/Prefabs/Objects/步骤状态.prefab @@ -1,67 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1817104531036070965 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531036070964} - m_Layer: 0 - m_Name: 3002 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531036070964 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531036070965} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104531132562976 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531132562991} - m_Layer: 0 - m_Name: 3012 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531132562991 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531132562976} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1817104531314915916 GameObject: m_ObjectHideFlags: 0 @@ -120,254 +58,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 728973cb69f5b2d4b9a1ef0a634de34b, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1817104531352388365 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531352388364} - m_Layer: 0 - m_Name: 3006 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531352388364 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531352388365} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 5 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104531430433246 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531430433245} - m_Layer: 0 - m_Name: 3013 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531430433245 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531430433246} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 12 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104531524257620 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531524257619} - m_Layer: 0 - m_Name: 3015 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531524257619 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531524257620} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 14 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104531718791355 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531718791354} - m_Layer: 0 - m_Name: 3003 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531718791354 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531718791355} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104531821779505 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531821779504} - m_Layer: 0 - m_Name: 3014 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531821779504 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531821779505} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 13 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104531948292490 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104531948292489} - m_Layer: 0 - m_Name: 3016 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104531948292489 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104531948292490} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 15 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532014346779 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532014346778} - m_Layer: 0 - m_Name: 3009 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532014346778 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532014346779} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532177289210 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532177289209} - m_Layer: 0 - m_Name: 3005 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532177289209 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532177289210} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1817104532282105279 GameObject: m_ObjectHideFlags: 0 @@ -397,25 +87,7 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1817104532874197423} - - {fileID: 1817104531036070964} - - {fileID: 1817104531718791354} - - {fileID: 1817104532686772023} - - {fileID: 1817104532177289209} - - {fileID: 1817104531352388364} - - {fileID: 1817104532699103356} - - {fileID: 1817104532388971730} - - {fileID: 1817104532014346778} - - {fileID: 1817104532514673092} - - {fileID: 1817104532883171829} - - {fileID: 1817104531132562991} - - {fileID: 1817104531430433245} - - {fileID: 1817104531821779504} - - {fileID: 1817104531524257619} - - {fileID: 1817104531948292489} - - {fileID: 1817104532576272471} - - {fileID: 1817104532575313426} + m_Children: [] m_Father: {fileID: 1817104532306234130} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -445,7 +117,6 @@ MonoBehaviour: m_EditorClassIdentifier: systemId: 0 schemeId: 0 - subProcessId: 0 --- !u!1 &1817104532306234131 GameObject: m_ObjectHideFlags: 0 @@ -478,251 +149,3 @@ Transform: m_Father: {fileID: 1817104531314915914} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532388971731 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532388971730} - m_Layer: 0 - m_Name: 3008 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532388971730 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532388971731} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532514673093 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532514673092} - m_Layer: 0 - m_Name: 3010 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532514673092 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532514673093} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532575313427 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532575313426} - m_Layer: 0 - m_Name: 3018 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532575313426 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532575313427} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 17 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532576272488 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532576272471} - m_Layer: 0 - m_Name: 3017 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532576272471 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532576272488} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 16 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532686772040 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532686772023} - m_Layer: 0 - m_Name: 3004 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532686772023 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532686772040} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532699103357 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532699103356} - m_Layer: 0 - m_Name: 3007 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532699103356 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532699103357} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532874197408 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532874197423} - m_Layer: 0 - m_Name: 3001 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532874197423 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532874197408} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1817104532883171830 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1817104532883171829} - m_Layer: 0 - m_Name: 3011 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1817104532883171829 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1817104532883171830} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1817104532282105278} - m_RootOrder: 10 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/03_OfficeScene.unity b/Assets/Scenes/03_OfficeScene.unity index 8232157..1af8a58 100644 --- a/Assets/Scenes/03_OfficeScene.unity +++ b/Assets/Scenes/03_OfficeScene.unity @@ -735,6 +735,7 @@ MonoBehaviour: currentSubProcessID: 0 currentSubProcessStepID: 0 currentSubProcessStepTriggerID: 0 + mobileController: {fileID: 919132148358585193} --- !u!1 &2077977345 GameObject: m_ObjectHideFlags: 0 @@ -1809,7 +1810,7 @@ MonoBehaviour: seeThroughTexture: {fileID: 0} seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 - rmsCount: 0 + rmsCount: 2 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 diff --git a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs index 63a4ee2..82e0965 100644 --- a/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs +++ b/Assets/Scripts/CXX/StepState/1002/StepState_1002.cs @@ -51,22 +51,40 @@ public class StepState_1002 : StepState else if (num == 3003) { //Ʊ - OfficeManager.Instance.mobileController.downIndex = 1; + OfficeManager.Instance.mobileController.downIndex = 2; } else if (num == 3004) { //дװ𹤵 - OfficeManager.Instance.mobileController.downIndex = 1; } else if (num == 3005) { //׸ //ȷװ PacksackBagMgr.Instance.ClearAllToolAndDiveceAndMaterial(); + } else if (num == 3006) { //ѡȡ + //װõ + Tool_SelectComponent item1=ToolAndmaterialMgr.Instance.GetItemInfoByName("ȫñ"); + Tool_SelectComponent item2 = ToolAndmaterialMgr.Instance.GetItemInfoByName(""); + Tool_SelectComponent item3 = ToolAndmaterialMgr.Instance.GetItemInfoByName("Ե"); + Tool_SelectComponent item4 = ToolAndmaterialMgr.Instance.GetItemInfoByName("Եѥ"); + PacksackBagMgr.Instance.AddOneToolOrMater(item1.itemInfo); + PacksackBagMgr.Instance.AddOneToolOrMater(item2.itemInfo); + PacksackBagMgr.Instance.AddOneToolOrMater(item3.itemInfo); + PacksackBagMgr.Instance.AddOneToolOrMater(item4.itemInfo); + Destroy(item1); + Destroy(item2); + Destroy(item3); + Destroy(item4); + // + PacksackBagMgr.Instance.WearItemState(item1.itemInfo, true); + PacksackBagMgr.Instance.WearItemState(item2.itemInfo, true); + PacksackBagMgr.Instance.WearItemState(item3.itemInfo, true); + PacksackBagMgr.Instance.WearItemState(item4.itemInfo, true); } else if (num == 3007) { diff --git a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs index 3f4e1da..3e94c15 100644 --- a/Assets/Scripts/Project/Manager/PacksackBagMgr.cs +++ b/Assets/Scripts/Project/Manager/PacksackBagMgr.cs @@ -7,7 +7,13 @@ using UnityEngine; /// public class PacksackBagMgr : BaseManager { - private readonly Dictionary> toolAndMaterialDic = new Dictionary>(); + /// + /// 背包里所有东西 + /// + private Dictionary> toolAndMaterialDic = new Dictionary>(); + /// + /// 已经穿戴 + /// public Dictionary wearDic = new Dictionary(); private PacksackBagMgr() @@ -94,7 +100,7 @@ public class PacksackBagMgr : BaseManager } /// - /// 移除全部工具 设备 材料 + /// 拿出背包所有东西 /// public void ClearAllToolAndDiveceAndMaterial() { @@ -108,6 +114,7 @@ public class PacksackBagMgr : BaseManager obj.name = temp[indexJ].toolName; obj.transform.position = temp[indexJ].selfPosInToolRoom; obj.GetComponent().itemInfo = temp[indexJ]; + obj.GetComponent().GetInfo(); } } wearDic.Clear(); diff --git a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs index 7412579..8bcf969 100644 --- a/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs +++ b/Assets/Scripts/Project/Manager/ToolAndmaterialMgr.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Linq; using UnityEngine; /// @@ -20,7 +21,11 @@ public class ToolAndmaterialMgr : BaseManager toolAndMaterialList = GameManager.DataMgr.GetCurrentSystemToolAndMaterials(toolOrMaterilOrDevice); } - + /// + /// 获取指定工具 + /// + /// + /// public D_ToolAndMaterialData GetToolOrMaterialOrDeviceInfoByObjName(string objName) { for (int i = 0; i < toolAndMaterialList.Count; i++) @@ -30,4 +35,15 @@ public class ToolAndmaterialMgr : BaseManager } return null; } + + /// + /// 获取ItemInfo + /// + /// + /// + public Tool_SelectComponent GetItemInfoByName(string objName) + { + Tool_SelectComponent tmp= GameObject.FindObjectsOfType().ToList().Find(a => a.gameObject.name == objName); + return tmp; + } } \ No newline at end of file diff --git a/Assets/Scripts/Project/Objects/Other/MobileController.cs b/Assets/Scripts/Project/Objects/Other/MobileController.cs index c19a486..e333ab8 100644 --- a/Assets/Scripts/Project/Objects/Other/MobileController.cs +++ b/Assets/Scripts/Project/Objects/Other/MobileController.cs @@ -19,7 +19,7 @@ public class MobileController : PermanentTriggerBase { panel.Init(triggerName); }); - downIndex++; + downIndex=1; } _highlight.SetHighlighted(false); break; @@ -29,7 +29,7 @@ public class MobileController : PermanentTriggerBase panel.Init(triggerName, "xxxԱxxxطչʽѹܼװðװҵ", PlayerTalk); }); _highlight.SetHighlighted(false); - downIndex = 0; + downIndex = 2; break; } } diff --git a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs index 6746e3c..5ec146c 100644 --- a/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs +++ b/Assets/Scripts/Project/Objects/ToolAndMaterial/Tool_SelectComponent.cs @@ -26,6 +26,7 @@ public class Tool_SelectComponent : BaseToolOrDevice { GameManager.PacksackBagMgr.AddOneToolOrMater(itemInfo); GameManager.UIMgr.HidePanel();//ʾ + Destroy(gameObject); } }