From 8cdf40a9ad52994cd6ab44923bedf9d4e64e768b Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Sat, 22 Feb 2025 02:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/RawResources/Art/维修界面UI.psd.meta | 4 +- .../Yarn/FP_Shitou2_2/Stage4_刻录.yarn | 4 +- Assets/Scenes/ExpressFixScene.unity | 1150 +++++------------ .../MiniGame/Engine/MovablePartGroup.cs | 41 +- Assets/Scripts/MiniGame/Engine/StaticGear.cs | 32 - .../MiniGame/Engine/StaticGear.cs.meta | 3 - Assets/Scripts/UI/DialogUI/DialogBox.cs | 2 +- Assets/Scripts/UI/DialogUI/DialogBoxBase.cs | 6 + .../LevelData/GearSystem/stone_day2_1.json | 2 +- .../LevelData/GearSystem/temp.json | 2 +- 10 files changed, 400 insertions(+), 846 deletions(-) delete mode 100644 Assets/Scripts/MiniGame/Engine/StaticGear.cs delete mode 100644 Assets/Scripts/MiniGame/Engine/StaticGear.cs.meta diff --git a/Assets/RawResources/Art/维修界面UI.psd.meta b/Assets/RawResources/Art/维修界面UI.psd.meta index ebd1997ba..acfcd4612 100644 --- a/Assets/RawResources/Art/维修界面UI.psd.meta +++ b/Assets/RawResources/Art/维修界面UI.psd.meta @@ -110,7 +110,7 @@ ScriptedImporter: y: 2172 width: 2031 height: 121 - spriteID: 6e6a3e7411e18674997c8735b867dd87 + spriteID: a428a8a5f3f249742a6da694bd87ef36 spriteBone: [] spriteOutline: [] vertices: [] @@ -365,7 +365,7 @@ ScriptedImporter: spriteName: "\u77E9\u5F62 1" isGroup: 0 parentIndex: -1 - spriteID: 6e6a3e7411e18674997c8735b867dd87 + spriteID: a428a8a5f3f249742a6da694bd87ef36 layerID: 25 mosaicPosition: {x: 1551, y: 2172} flatten: 0 diff --git a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn index 917eae51d..0cdbf0f46 100644 --- a/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn +++ b/Assets/Resources/Yarn/FP_Shitou2_2/Stage4_刻录.yarn @@ -88,7 +88,7 @@ HeartModule: 将机体的燃料转化为电能/机械能，驱动机体和内部 <> me: 至少…他能重新听到音乐了。 <> - > me: 没有受损…可以开始刻录。 @@ -186,7 +186,7 @@ title: 刻录 position: 728,79 --- -<> +<> <> <> me: 如果我没有理解错这套东西的原理…
我应该可以把这个读取声音的探头，改造成一个刻出声音的钻头。 diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity index 56089a374..cecadad97 100644 --- a/Assets/Scenes/ExpressFixScene.unity +++ b/Assets/Scenes/ExpressFixScene.unity @@ -575,10 +575,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 1790367546} - - {fileID: 807313865} - - {fileID: 264250038} - - {fileID: 2058308927} + - {fileID: 1719420715} + - {fileID: 1138158832} + - {fileID: 1376277120} + - {fileID: 2107202952} m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &200558568 @@ -796,115 +796,6 @@ SpriteMask: m_BackSortingOrder: 10 m_IsCustomRangeActive: 1 m_SpriteSortPoint: 0 ---- !u!1 &264250037 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 264250038} - - component: {fileID: 264250040} - - component: {fileID: 264250039} - m_Layer: 0 - m_Name: Pluggable Shaft1 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &264250038 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264250037} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.861, y: -0.922, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &264250039 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264250037} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.5 - initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &264250040 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 264250037} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 23 - m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &287043729 GameObject: m_ObjectHideFlags: 0 @@ -1626,7 +1517,7 @@ MonoBehaviour: panelClosePos: {x: -5.694, y: -0.531, z: 0} needleEmptyPos: {x: 0, y: 0, z: -48.281} needlePosArr: - - {x: 0, y: 0, z: -7.863} + - {x: 0, y: 0, z: -10} - {x: 0, y: 0, z: -6.878} - {x: 0, y: 0, z: 20} needleDuration: 1.5 @@ -1904,11 +1795,7 @@ Transform: m_LocalPosition: {x: -5.694, y: -0.336, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1390477937} - - {fileID: 1836729207} - - {fileID: 726391333} - - {fileID: 1430235954} + m_Children: [] m_Father: {fileID: 657112469} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &709691613 @@ -1963,115 +1850,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &726391332 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 726391333} - - component: {fileID: 726391335} - - component: {fileID: 726391334} - m_Layer: 0 - m_Name: Panel Shaft3 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &726391333 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 726391332} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.002, y: -0.452, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 709691612} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &726391334 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 726391332} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 1 - gearProp: NewGear - isInitGearBroken: 0 - isInitGearDisc: 1 - initRadius: 0.5 - initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &726391335 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 726391332} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 23 - m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &753279730 GameObject: m_ObjectHideFlags: 0 @@ -2195,115 +1973,6 @@ MonoBehaviour: cantStopRunning: 0 showPicPath: checkPoints: [] ---- !u!1 &807313864 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 807313865} - - component: {fileID: 807313867} - - component: {fileID: 807313866} - m_Layer: 0 - m_Name: Pluggable Shaft2 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &807313865 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 807313864} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.54, y: -0.525, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &807313866 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 807313864} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.3 - initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &807313867 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 807313864} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 23 - m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &824610161 GameObject: m_ObjectHideFlags: 0 @@ -2628,6 +2297,115 @@ MonoBehaviour: updateSpeedEvent: m_PersistentCalls: m_Calls: [] +--- !u!1 &1138158831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1138158832} + - component: {fileID: 1138158834} + - component: {fileID: 1138158833} + m_Layer: 0 + m_Name: Pluggable Shaft2 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1138158832 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138158831} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.54, y: -0.525, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1138158833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138158831} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + hasGear: 1 + gearProp: + isInitGearBroken: 0 + isInitGearDisc: 0 + initRadius: 0.3 + initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &1138158834 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1138158831} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 23 + m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!21 &1140581779 Material: serializedVersion: 8 @@ -2982,7 +2760,7 @@ Transform: - {fileID: 1641756485} m_Father: {fileID: 5393568355081744312} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1390477936 +--- !u!1 &1376277119 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2990,171 +2768,62 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1390477937} - - component: {fileID: 1390477939} - - component: {fileID: 1390477938} + - component: {fileID: 1376277120} + - component: {fileID: 1376277122} + - component: {fileID: 1376277121} m_Layer: 0 - m_Name: Panel Shaft1 + m_Name: Pluggable Shaft1 m_TagString: Shaft m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1390477937 +--- !u!4 &1376277120 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390477936} + m_GameObject: {fileID: 1376277119} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.001, y: 1.123, z: 0} + m_LocalPosition: {x: -1.861, y: -0.922, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 709691612} + m_Father: {fileID: 199118573} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1390477938 +--- !u!114 &1376277121 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390477936} + m_GameObject: {fileID: 1376277119} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} m_Name: m_EditorClassIdentifier: id: 0 - shaftType: 2 + shaftType: 3 hasGear: 1 - gearProp: NewGear + gearProp: isInitGearBroken: 0 isInitGearDisc: 0 - initRadius: 0.4 + initRadius: 0.5 initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} discIdx: 0 childGear: {fileID: 0} targetSpeed: 0 speed: 0 ---- !u!212 &1390477939 +--- !u!212 &1376277122 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1390477936} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 23 - m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1430235953 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1430235954} - - component: {fileID: 1430235956} - - component: {fileID: 1430235955} - m_Layer: 0 - m_Name: Panel Shaft4 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1430235954 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1430235953} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.006, y: -1.273, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 709691612} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1430235955 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1430235953} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 0 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.3 - initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &1430235956 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1430235953} + m_GameObject: {fileID: 1376277119} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -3758,6 +3427,115 @@ SpriteRenderer: m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1719420714 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1719420715} + - component: {fileID: 1719420717} + - component: {fileID: 1719420716} + m_Layer: 0 + m_Name: Pluggable Shaft3 + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1719420715 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719420714} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.232, y: -0.319, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1719420716 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719420714} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 3 + hasGear: 1 + gearProp: + isInitGearBroken: 0 + isInitGearDisc: 1 + initRadius: 0.4 + initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &1719420717 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1719420714} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 23 + m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1777972740 GameObject: m_ObjectHideFlags: 0 @@ -3842,229 +3620,11 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 1 ---- !u!1 &1790367545 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1790367546} - - component: {fileID: 1790367548} - - component: {fileID: 1790367547} - m_Layer: 0 - m_Name: Pluggable Shaft3 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1790367546 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1790367545} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.232, y: -0.319, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1790367547 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1790367545} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 1 - initRadius: 0.4 - initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &1790367548 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1790367545} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 23 - m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!4 &1821936329 stripped Transform: m_CorrespondingSourceObject: {fileID: 7611243318142021168, guid: 13f00ab6092291d49a9312e52873d80b, type: 3} m_PrefabInstance: {fileID: 9210352354887959608} m_PrefabAsset: {fileID: 0} ---- !u!1 &1836729206 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1836729207} - - component: {fileID: 1836729209} - - component: {fileID: 1836729208} - m_Layer: 0 - m_Name: Panel Shaft2 - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1836729207 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1836729206} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.006, y: 0.362, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 709691612} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1836729208 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1836729206} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 2 - hasGear: 1 - gearProp: NewGear - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.3 - initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &1836729209 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1836729206} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 23 - m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1858501050 GameObject: m_ObjectHideFlags: 0 @@ -4259,115 +3819,6 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 1273433143} ---- !u!1 &2058308926 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2058308927} - - component: {fileID: 2058308929} - - component: {fileID: 2058308928} - m_Layer: 0 - m_Name: Driver Shaft - m_TagString: Shaft - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2058308927 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058308926} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -2.263, y: 0.193, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 199118573} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2058308928 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058308926} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} - m_Name: - m_EditorClassIdentifier: - id: 0 - shaftType: 0 - hasGear: 1 - gearProp: - isInitGearBroken: 0 - isInitGearDisc: 0 - initRadius: 0.49 - initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} - discIdx: 0 - childGear: {fileID: 0} - targetSpeed: 0 - speed: 0 ---- !u!212 &2058308929 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2058308926} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 1134468525 - m_SortingLayer: 10 - m_SortingOrder: 23 - m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 0.55} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &2062639481 GameObject: m_ObjectHideFlags: 0 @@ -4934,6 +4385,115 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} m_PrefabInstance: {fileID: 2104582589} m_PrefabAsset: {fileID: 0} +--- !u!1 &2107202951 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2107202952} + - component: {fileID: 2107202954} + - component: {fileID: 2107202953} + m_Layer: 0 + m_Name: Driver Shaft + m_TagString: Shaft + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2107202952 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107202951} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2.263, y: 0.193, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 199118573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2107202953 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107202951} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 468fc3bf68cb91149818f305858bc7fd, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 0 + shaftType: 0 + hasGear: 1 + gearProp: + isInitGearBroken: 0 + isInitGearDisc: 0 + initRadius: 0.49 + initSprite: {fileID: -7579553090295930101, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3} + discIdx: 0 + childGear: {fileID: 0} + targetSpeed: 0 + speed: 0 +--- !u!212 &2107202954 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107202951} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 1134468525 + m_SortingLayer: 10 + m_SortingOrder: 23 + m_Sprite: {fileID: -5530534795728576300, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 0.55} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!4 &18996214280699033 Transform: m_ObjectHideFlags: 0 @@ -5379,7 +4939,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 8ea0dfea72b9cee4abd26cb13d0ea632, type: 2} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -6031,7 +5591,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 8ea0dfea72b9cee4abd26cb13d0ea632, type: 2} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8347,7 +7907,7 @@ SpriteRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 8ea0dfea72b9cee4abd26cb13d0ea632, type: 2} + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -8544,11 +8104,11 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: engineGears: - - renderer: {fileID: 2851808692520599006} + - gear: {fileID: 6248761609012951487} speedRadio: 1 - - renderer: {fileID: 1236773793422698414} + - gear: {fileID: 8491830691954995870} speedRadio: 1.2 - - renderer: {fileID: 7812654477309872753} + - gear: {fileID: 7812654477309872752} speedRadio: -0.6 piston: {fileID: 0} --- !u!4 &8175021726940966765 diff --git a/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs b/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs index 9c1c75be9..00e7bcc71 100644 --- a/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs +++ b/Assets/Scripts/MiniGame/Engine/MovablePartGroup.cs @@ -1,5 +1,7 @@ using System; +using DG.Tweening; using UnityEngine; +using UnityEngine.UIElements; namespace AibisDream { @@ -7,8 +9,7 @@ namespace AibisDream { #region 动件索引 - [Header("可动组件索引")] - public EngineGear[] engineGears; + [Header("可动组件索引")] public EngineGear[] engineGears; public GameObject piston; #endregion @@ -22,7 +23,13 @@ namespace AibisDream private void Start() { + // 赋予初始速度 + foreach (var gear in engineGears) + { + gear.Rotate(_engineSystem.engineConfig.gearSpeed); + } _engineSystem.updateSpeedEvent.AddListener(OnSpeedUpdate); + } private void OnSpeedUpdate(float originSpeed, float speedScale) @@ -30,17 +37,18 @@ namespace AibisDream // 处理齿轮速度 foreach (var gear in engineGears) { - gear.SetSpeedScale(speedScale * _engineSystem.engineConfig.gearSpeed); + gear.SetSpeedScale(speedScale); } } } [Serializable] - public struct EngineGear + public class EngineGear { - public Renderer renderer; + public Transform gear; public float speedRadio; - private static readonly int UVRotateSpeed = Shader.PropertyToID("_UVRotateSpeed"); + + private Tween _rotateTween; /// /// 设置速度 @@ -48,8 +56,23 @@ namespace AibisDream /// 基础速度 public void SetSpeedScale(float speedScale) { - renderer.material.SetFloat(UVRotateSpeed, speedRadio * speedScale); + if (_rotateTween != null) + { + _rotateTween.timeScale = speedScale; + } + // _rotateTween.timeScale = speedScale; + } + + public void Rotate(float initSpeed) + { + var duration = 1 / Mathf.Abs(initSpeed * speedRadio); + + var target = speedRadio >= 0 ? new Vector3(0, 0, 360) : new Vector3(0, 0, -360); + + Debug.Log("Rotate"); + _rotateTween = gear.DORotate(target, duration, RotateMode.LocalAxisAdd) + .SetEase(Ease.Linear) + .SetLoops(-1, LoopType.Incremental); } } -} - +} \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/StaticGear.cs b/Assets/Scripts/MiniGame/Engine/StaticGear.cs deleted file mode 100644 index 5699f645c..000000000 --- a/Assets/Scripts/MiniGame/Engine/StaticGear.cs +++ /dev/null @@ -1,32 +0,0 @@ -using AibisDream.FixSystem; -using DG.Tweening; -using UnityEngine; - -namespace AibisDream -{ - public class StaticGear : MonoBehaviour - { - public float initSpeed; - private Tween _rotateTween; - - private void Start() - { - FixSystemCenter.SystemDic.Get().updateSpeedEvent.AddListener(UpdateSpeedScale); - } - - /// - /// 开始旋转 - /// - public void StartRotate() - { - _rotateTween = transform.DORotate(new Vector3(0, 0, 360), 1 / Mathf.Abs(initSpeed), RotateMode.LocalAxisAdd) - .SetEase(Ease.Linear) - .SetLoops(-1, LoopType.Incremental); - } - - private void UpdateSpeedScale(float originSpeed, float speed) - { - _rotateTween.timeScale = speed; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/StaticGear.cs.meta b/Assets/Scripts/MiniGame/Engine/StaticGear.cs.meta deleted file mode 100644 index ac28556c7..000000000 --- a/Assets/Scripts/MiniGame/Engine/StaticGear.cs.meta +++ /dev/null @@ -1,3 +0,0 @@ -fileFormatVersion: 2 -guid: 79006d3d747c4b8482204874bbbf6ae3 -timeCreated: 1737104031 \ No newline at end of file diff --git a/Assets/Scripts/UI/DialogUI/DialogBox.cs b/Assets/Scripts/UI/DialogUI/DialogBox.cs index 71d549735..c14877323 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBox.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBox.cs @@ -6,7 +6,7 @@ namespace AibisDream { [SerializeField] protected GameObject choiceButton; - private void Start() + protected override void OnAwake() { // 初始化选择按钮 choiceButtonPrefab = choiceButton; diff --git a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs index 3785d175f..b0e657b93 100644 --- a/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs +++ b/Assets/Scripts/UI/DialogUI/DialogBoxBase.cs @@ -61,6 +61,12 @@ namespace AibisDream _dialogText = transform.Find(DialogText)?.gameObject.GetComponent(); _nextArray = transform.Find(NextArray)?.gameObject; _choiceBox = transform.Find(ChoiceBox)?.gameObject; + + OnAwake(); + } + + protected virtual void OnAwake() + { } #endregion diff --git a/Assets/StreamingAssets/LevelData/GearSystem/stone_day2_1.json b/Assets/StreamingAssets/LevelData/GearSystem/stone_day2_1.json index 4a48f70ef..73bfabead 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/stone_day2_1.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/stone_day2_1.json @@ -1 +1 @@ -{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft9","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.69999993,"y":-0.919,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"},{"shaftName":"Pluggable Shaft8","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.588,"y":-0.901,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft7","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.09,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.21799946,"y":-0.413000017,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft6","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.84499979,"y":-0.350999951,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft5","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.98999882,"y":-0.585000038,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮A"},{"shaftName":"Pluggable Shaft4","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.27,"isGearBroken":true,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.17599964,"y":-0.04199993,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft3","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.9659996,"y":0.340000182,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft2","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.70999885,"y":0.348000079,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Pluggable Shaft1","shaftType":3,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.39599943,"y":0.3350002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Driver Shaft","shaftType":0,"initialSpeed":1.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.09,"isGearBroken":true,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.17799878,"y":0.4850002,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"},{"shaftName":"Target Shaft","shaftType":1,"initialSpeed":0.0,"targetSpeed":0.3,"hasChildGear":true,"radius":0.27,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.14999962,"y":-0.921000063,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.18,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.019,"y":0.717,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Panel Shaft2","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.27,"isGearBroken":true,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.011,"y":0.003,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/坏齿轮A"},{"shaftName":"Panel Shaft3","shaftType":2,"initialSpeed":0.0,"targetSpeed":0.0,"hasChildGear":false,"radius":0.0,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.011,"y":-0.668,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}]} \ No newline at end of file +{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft2","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft1","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[]} \ No newline at end of file diff --git a/Assets/StreamingAssets/LevelData/GearSystem/temp.json b/Assets/StreamingAssets/LevelData/GearSystem/temp.json index 6dc5e561c..73bfabead 100644 --- a/Assets/StreamingAssets/LevelData/GearSystem/temp.json +++ b/Assets/StreamingAssets/LevelData/GearSystem/temp.json @@ -1 +1 @@ -{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"},{"shaftName":"Pluggable Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Pluggable Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":null,"isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.076,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面-扫描/心脏齿轮D"},{"shaftName":"Panel Shaft3","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":null,"isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-0.007,"y":-0.898,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱唱片齿轮"}]} \ No newline at end of file +{"shaftLevelDataArray":[{"shaftName":"Pluggable Shaft3","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"","isGearBroken":false,"isDisc":true,"discIdx":0,"shaftPos":{"x":-1.232,"y":-0.319,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft2","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.3,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.54,"y":-0.525,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Pluggable Shaft1","shaftType":3,"targetSpeed":0.0,"hasChildGear":true,"radius":0.5,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-1.861,"y":-0.922,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Driver Shaft","shaftType":0,"targetSpeed":0.0,"hasChildGear":true,"radius":0.49,"gearProp":"","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-2.263,"y":0.193,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/变速箱齿轮C"}],"panelShaftArray":[]} \ No newline at end of file