From 8203a60b3e14dcdb365125cdba61651bf37c4b13 Mon Sep 17 00:00:00 2001 From: huqibin <762612145@qq.com> Date: Mon, 26 May 2025 11:23:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=94=9F=E6=88=90=E8=A7=92?= =?UTF-8?q?=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Objects/Tools/剪刀.prefab | 432 ++++++++++-------- .../Prefabs/Objects/Tools/放大镜.prefab | 174 +++++-- .../Prefabs/Objects/Tools/镊子.prefab | 170 ++++--- .../UI/UI_Panel/UI_PPTForPracticePanel.cs | 4 +- 4 files changed, 464 insertions(+), 316 deletions(-) diff --git a/Assets/Resources/Prefabs/Objects/Tools/剪刀.prefab b/Assets/Resources/Prefabs/Objects/Tools/剪刀.prefab index 1b90f78..abcf6e6 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/剪刀.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/剪刀.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2389991061761730386 +--- !u!1 &1411266172656378516 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,177 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1386895308837508180} - - component: {fileID: 1792129039081959899} - - component: {fileID: 6417812592253852123} - m_Layer: 0 - m_Name: "\u53F3" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1386895308837508180 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2389991061761730386} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00021716818, y: 0.07885193, z: 0.004758329} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7981940549352085856} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &1792129039081959899 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2389991061761730386} - m_Mesh: {fileID: -6572694611387404206, guid: d270ecfd0321c2b4eab53ddf131d2993, type: 3} ---- !u!23 &6417812592253852123 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2389991061761730386} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 06ef7c3ac0a0094449c6d34a0f3b3872, type: 2} - - {fileID: 2100000, guid: 773a6245f79092f4097c85cf4b3c1144, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &3058748536516136812 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8903856354824536835} - - component: {fileID: 706720419754282122} - - component: {fileID: 8702530171107819726} - m_Layer: 0 - m_Name: "\u4E2D" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8903856354824536835 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3058748536516136812} - m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00021716818, y: 0.07885193, z: -0.00017218357} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7981940549352085856} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &706720419754282122 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3058748536516136812} - m_Mesh: {fileID: -4235297048467849908, guid: d270ecfd0321c2b4eab53ddf131d2993, type: 3} ---- !u!23 &8702530171107819726 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3058748536516136812} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 06ef7c3ac0a0094449c6d34a0f3b3872, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &7317887664770417626 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7981940549352085856} - - component: {fileID: 2948713324832603673} - - component: {fileID: 2371905008642840399} - - component: {fileID: 1834598697060695030} + - component: {fileID: 1411266172656378519} + - component: {fileID: 1411266172656378518} + - component: {fileID: 1411266172656378512} + - component: {fileID: 1411266172656378513} m_Layer: 0 m_Name: "\u526A\u5200" m_TagString: Untagged @@ -186,44 +19,42 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7981940549352085856 +--- !u!4 &1411266172656378519 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7317887664770417626} - m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_GameObject: {fileID: 1411266172656378516} + 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: - - {fileID: 8903856354824536835} - - {fileID: 1386895308837508180} - - {fileID: 8595371688209483253} + - {fileID: 9029822500002830881} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} ---- !u!65 &2948713324832603673 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &1411266172656378518 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7317887664770417626} + m_GameObject: {fileID: 1411266172656378516} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &2371905008642840399 + m_Size: {x: 0.066, y: 0.04, z: 0.18} + m_Center: {x: 0, y: -0.025, z: -0.07} +--- !u!114 &1411266172656378512 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7317887664770417626} + m_GameObject: {fileID: 1411266172656378516} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} @@ -389,13 +220,13 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 ---- !u!114 &1834598697060695030 +--- !u!114 &1411266172656378513 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7317887664770417626} + m_GameObject: {fileID: 1411266172656378516} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3} @@ -411,7 +242,7 @@ MonoBehaviour: selfAngleInToolRoom: {x: 0, y: 0, z: 0} index: 0 _highlight: {fileID: 0} ---- !u!1 &9134418660137114517 +--- !u!1 &3656684502240977939 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -419,9 +250,176 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8595371688209483253} - - component: {fileID: 9132305770106973885} - - component: {fileID: 5470332417022135956} + - component: {fileID: 48113478199613205} + - component: {fileID: 813806584369066650} + - component: {fileID: 5369827425385749146} + m_Layer: 0 + m_Name: "\u53F3" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &48113478199613205 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3656684502240977939} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.00021716818, y: 0.07885193, z: 0.004758329} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9029822500002830881} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &813806584369066650 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3656684502240977939} + m_Mesh: {fileID: -6572694611387404206, guid: d270ecfd0321c2b4eab53ddf131d2993, type: 3} +--- !u!23 &5369827425385749146 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3656684502240977939} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 06ef7c3ac0a0094449c6d34a0f3b3872, type: 2} + - {fileID: 2100000, guid: 773a6245f79092f4097c85cf4b3c1144, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &4172312985749883949 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7495407279936536642} + - component: {fileID: 1899135175328878539} + - component: {fileID: 7732761985780351887} + m_Layer: 0 + m_Name: "\u4E2D" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7495407279936536642 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4172312985749883949} + m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.00021716818, y: 0.07885193, z: -0.00017218357} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9029822500002830881} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1899135175328878539 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4172312985749883949} + m_Mesh: {fileID: -4235297048467849908, guid: d270ecfd0321c2b4eab53ddf131d2993, type: 3} +--- !u!23 &7732761985780351887 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4172312985749883949} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 06ef7c3ac0a0094449c6d34a0f3b3872, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7878531307984738516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7268024858594264756} + - component: {fileID: 7865999287256919548} + - component: {fileID: 6376909342842408405} m_Layer: 0 m_Name: "\u5DE6" m_TagString: Untagged @@ -429,36 +427,36 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8595371688209483253 +--- !u!4 &7268024858594264756 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9134418660137114517} + m_GameObject: {fileID: 7878531307984738516} m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00021716818, y: 0.07885193, z: 0.004758329} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7981940549352085856} + m_Father: {fileID: 9029822500002830881} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &9132305770106973885 +--- !u!33 &7865999287256919548 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9134418660137114517} + m_GameObject: {fileID: 7878531307984738516} m_Mesh: {fileID: 7750931221457179887, guid: d270ecfd0321c2b4eab53ddf131d2993, type: 3} ---- !u!23 &5470332417022135956 +--- !u!23 &6376909342842408405 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9134418660137114517} + m_GameObject: {fileID: 7878531307984738516} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -495,3 +493,37 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &8510553238449143963 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9029822500002830881} + m_Layer: 0 + m_Name: "\u526A\u5200\u6A21\u578B" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9029822500002830881 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8510553238449143963} + m_LocalRotation: {x: 0.70710677, y: -0, z: 0.000000018626448, w: 0.70710677} + m_LocalPosition: {x: -0.005499821, y: -0.025502637, z: -0.122299656} + m_LocalScale: {x: 0.6, y: 0.60000026, z: 0.6000004} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7495407279936536642} + - {fileID: 48113478199613205} + - {fileID: 7268024858594264756} + m_Father: {fileID: 1411266172656378519} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} diff --git a/Assets/Resources/Prefabs/Objects/Tools/放大镜.prefab b/Assets/Resources/Prefabs/Objects/Tools/放大镜.prefab index 1b6acd4..e16eb6f 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/放大镜.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/放大镜.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &8844781641072810642 +--- !u!1 &590501913110422586 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,12 +8,12 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8211516391836794920} - - component: {fileID: 5069629534667919245} - - component: {fileID: 7043073989629262663} - - component: {fileID: 6471711278273546410} - - component: {fileID: 1860660147608194545} - - component: {fileID: 9113740698893508381} + - component: {fileID: 590501913110422587} + - component: {fileID: 590501913110422582} + - component: {fileID: 590501913110422581} + - component: {fileID: 590501913110422580} + - component: {fileID: 590501913110422576} + - component: {fileID: 590501913110422583} m_Layer: 0 m_Name: "\u653E\u5927\u955C" m_TagString: Untagged @@ -21,37 +21,38 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8211516391836794920 +--- !u!4 &590501913110422587 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8844781641072810642} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_GameObject: {fileID: 590501913110422586} + m_LocalRotation: {x: 0.7791324, y: 0.14817007, z: 0.041291904, w: 0.6076952} + m_LocalPosition: {x: -0.0069000963, y: 0.023693845, z: -0.041398786} + m_LocalScale: {x: 0.59999996, y: 0.60000014, z: 0.6} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 8774358951399856357} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &5069629534667919245 +--- !u!33 &590501913110422582 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8844781641072810642} - m_Mesh: {fileID: 3013898592734553869, guid: 05be13885e3ff0e4faa49e9dfd918e6f, type: 3} ---- !u!23 &7043073989629262663 + m_GameObject: {fileID: 590501913110422586} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &590501913110422581 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8844781641072810642} - m_Enabled: 1 + m_GameObject: {fileID: 590501913110422586} + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -64,8 +65,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a52a9dd032fce7b4baa9f845c781e393, type: 2} - - {fileID: 2100000, guid: 5448e0bc6dd13c34ca9c12e946b7a3be, type: 2} + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -87,26 +87,48 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &6471711278273546410 +--- !u!65 &590501913110422580 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8844781641072810642} + m_GameObject: {fileID: 590501913110422586} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.09863343, y: 0.23603278, z: 0.02304826} - m_Center: {x: 0, y: 0.08503231, z: 0} ---- !u!114 &1860660147608194545 + m_Size: {x: 0.14, y: 0.258468, z: 0.0434308} + m_Center: {x: -0.0081, y: 0.0769, z: -0.0038} +--- !u!114 &590501913110422576 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8844781641072810642} + m_GameObject: {fileID: 590501913110422586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3} + m_Name: + m_EditorClassIdentifier: + itemInfo: + toolId: 0 + triggerID: 0 + toolName: "\u653E\u5927\u955C" + 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!114 &590501913110422583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590501913110422586} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} @@ -266,31 +288,93 @@ MonoBehaviour: seeThroughTexture: {fileID: 0} seeThroughTextureUVSpace: 0 seeThroughTextureScale: 1 - rmsCount: 1 + rmsCount: 2 hitFxInitialIntensity: 0 hitFxMode: 0 hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 ---- !u!114 &9113740698893508381 -MonoBehaviour: +--- !u!1 &8254843403251303007 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8844781641072810642} + serializedVersion: 6 + m_Component: + - component: {fileID: 8774358951399856357} + - component: {fileID: 5650631525129656128} + - component: {fileID: 7606549151302214538} + m_Layer: 0 + m_Name: "\u653E\u5927\u955C (1)" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8774358951399856357 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8254843403251303007} + m_LocalRotation: {x: -0, y: -0, z: -0.000000007450577, 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: 590501913110422587} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 110.81799, y: -43.451996, z: -52.26599} +--- !u!33 &5650631525129656128 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8254843403251303007} + m_Mesh: {fileID: 3013898592734553869, guid: 05be13885e3ff0e4faa49e9dfd918e6f, type: 3} +--- !u!23 &7606549151302214538 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8254843403251303007} m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3} - m_Name: - m_EditorClassIdentifier: - itemInfo: - toolId: 0 - triggerID: 0 - toolName: "\u653E\u5927\u955C" - toolOrDeviceOrMaterial: 0 - objPrefab: {fileID: 0} - selfPosInToolRoom: {x: 0, y: 0, z: 0} - selfAngleInToolRoom: {x: 0, y: 0, z: 0} - index: 0 - _highlight: {fileID: 0} + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a52a9dd032fce7b4baa9f845c781e393, type: 2} + - {fileID: 2100000, guid: 5448e0bc6dd13c34ca9c12e946b7a3be, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Resources/Prefabs/Objects/Tools/镊子.prefab b/Assets/Resources/Prefabs/Objects/Tools/镊子.prefab index 6a63822..78e95a4 100644 --- a/Assets/Resources/Prefabs/Objects/Tools/镊子.prefab +++ b/Assets/Resources/Prefabs/Objects/Tools/镊子.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &296639407149506318 +--- !u!1 &3625740440735828241 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,12 +8,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1105087614219126196} - - component: {fileID: 4105546464027478545} - - component: {fileID: 2241987257314115291} - - component: {fileID: 5919839826226333174} - - component: {fileID: 7251050130918633402} - - component: {fileID: 4586547873467318055} + - component: {fileID: 3625740440735828242} + - component: {fileID: 3625740440735828243} + - component: {fileID: 3625740440735828253} + - component: {fileID: 3625740440735828252} m_Layer: 0 m_Name: "\u954A\u5B50" m_TagString: Untagged @@ -21,91 +19,42 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1105087614219126196 +--- !u!4 &3625740440735828242 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296639407149506318} + m_GameObject: {fileID: 3625740440735828241} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4397546149439859537} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4105546464027478545 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296639407149506318} - m_Mesh: {fileID: 1997831838763234485, guid: 4b6b11f2275e4e24e905eb9919f8f644, type: 3} ---- !u!23 &2241987257314115291 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296639407149506318} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: efd2cc93dc880e744a827eb1b67cb47b, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &5919839826226333174 +--- !u!65 &3625740440735828243 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296639407149506318} + m_GameObject: {fileID: 3625740440735828241} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 0.02710881, y: 0.16016161, z: 0.021778284} - m_Center: {x: 0.0000000121071935, y: 0.065217875, z: 0} ---- !u!114 &7251050130918633402 + m_Size: {x: 0.02710881, y: 0.1, z: 0.02177828} + m_Center: {x: 0, y: -0.04, z: 0} +--- !u!114 &3625740440735828253 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296639407149506318} + m_GameObject: {fileID: 3625740440735828241} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3} @@ -271,13 +220,13 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 ---- !u!114 &4586547873467318055 +--- !u!114 &3625740440735828252 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 296639407149506318} + m_GameObject: {fileID: 3625740440735828241} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6f31a9609373b04faa317bc87afe550, type: 3} @@ -293,3 +242,86 @@ MonoBehaviour: selfAngleInToolRoom: {x: 0, y: 0, z: 0} index: 0 _highlight: {fileID: 0} +--- !u!1 &3912757541646348779 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4397546149439859537} + - component: {fileID: 768113846348997876} + - component: {fileID: 3264006029895012414} + m_Layer: 0 + m_Name: "\u954A\u5B50" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4397546149439859537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3912757541646348779} + m_LocalRotation: {x: 1, y: -0.000000007450579, z: -0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6000001} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3625740440735828242} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 0} +--- !u!33 &768113846348997876 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3912757541646348779} + m_Mesh: {fileID: 1997831838763234485, guid: 4b6b11f2275e4e24e905eb9919f8f644, type: 3} +--- !u!23 &3264006029895012414 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3912757541646348779} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: efd2cc93dc880e744a827eb1b67cb47b, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs b/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs index d784f95..c4c772c 100644 --- a/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs +++ b/Assets/Scripts/Project/UI/UI_Panel/UI_PPTForPracticePanel.cs @@ -82,9 +82,9 @@ public class UI_PPTForPracticePanel : BasePanel { GameManager.UIMgr.ShowPanel(E_UI_Layer.Bot, (panel) => { - Debug.Log(".1"); + Debug.Log("˳UI_PPTForPracticePanel"); GameManager.UIMgr.HidePanel(); - GameManager.UIMgr.HidePanel(); + //GameManager.UIMgr.HidePanel(); }); }); }