From ea689da0ddf647d95ee1ac12c1f974e345cfbeab Mon Sep 17 00:00:00 2001
From: Ding Yuntian <1491671119@qq.com>
Date: Sat, 25 Jan 2025 19:08:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E9=80=9F=E7=AE=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Resources/Art/Obj/变速箱唱片齿轮.asset | 212 ---
.../Art/Obj/变速箱唱片齿轮.asset.meta | 8 -
Assets/Resources/Art/Obj/变速箱唱片齿轮.png | 3 +
.../Resources/Art/Obj/变速箱唱片齿轮.png.meta | 153 ++
Assets/Resources/Shader/PeipeiFixScene.meta | 2 +-
.../Yarn/FP_Shitou1/Stage2_提速.yarn | 2 +-
Assets/Scenes/ExpressFixScene.unity | 1653 ++++++++---------
Assets/Scenes/PeipeiFixScene.meta | 2 +-
.../Scripts/FixSystemNew/FixStateMachine.cs | 5 -
.../Scripts/MiniGame/Engine/EngineSystem.cs | 54 +-
.../MiniGame/Engine/EngineYarnCommand.cs | 7 +-
.../Scripts/MiniGame/Engine/SpeedDashboard.cs | 11 +-
.../LevelData/GearSystem/stone_day1_2.json | 2 +-
.../LevelData/GearSystem/temp.json | 2 +-
14 files changed, 1003 insertions(+), 1113 deletions(-)
delete mode 100644 Assets/Resources/Art/Obj/变速箱唱片齿轮.asset
delete mode 100644 Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta
create mode 100644 Assets/Resources/Art/Obj/变速箱唱片齿轮.png
create mode 100644 Assets/Resources/Art/Obj/变速箱唱片齿轮.png.meta
diff --git a/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset b/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset
deleted file mode 100644
index f15ace907..000000000
--- a/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset
+++ /dev/null
@@ -1,212 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!213 &21300000
-Sprite:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_Name: "\u53D8\u901F\u7BB1\u5531\u7247\u9F7F\u8F6E"
- m_Rect:
- serializedVersion: 2
- x: 3962
- y: 5054
- width: 130
- height: 130
- m_Offset: {x: 0, y: 0}
- m_Border: {x: 0, y: 0, z: 0, w: 0}
- m_PixelsToUnits: 215
- m_Pivot: {x: 0.5, y: 0.5}
- m_Extrude: 1
- m_IsPolygon: 0
- m_AtlasName:
- m_PackingTag:
- m_RenderDataKey:
- 149a798e8f987264f82beb4f4052eb5e: -611960561148999933
- m_AtlasTags: []
- m_SpriteAtlas: {fileID: 0}
- m_RD:
- serializedVersion: 3
- texture: {fileID: -8328923581568760697, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
- alphaTexture: {fileID: 0}
- secondaryTextures: []
- m_SubMeshes:
- - serializedVersion: 2
- firstByte: 0
- indexCount: 6
- topology: 0
- baseVertex: 0
- firstVertex: 0
- vertexCount: 4
- localAABB:
- m_Center: {x: 0, y: 0, z: 0}
- m_Extent: {x: 0, y: 0, z: 0}
- m_IndexBuffer: 000001000200020001000300
- m_VertexData:
- serializedVersion: 3
- m_VertexCount: 4
- m_Channels:
- - stream: 0
- offset: 0
- format: 0
- dimension: 3
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 1
- offset: 0
- format: 0
- dimension: 2
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 1
- offset: 8
- format: 0
- dimension: 4
- - stream: 1
- offset: 24
- format: 10
- dimension: 4
- m_DataSize: 208
- _typelessdata: 6bca9abe6bca9a3e000000006bca9a3e6bca9a3e000000006bca9abe6bca9abe000000006bca9a3e6bca9abe0000000000a0773f0000223f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f0000223f0000803f0000000000000000000000000000000000000000000000000000000000a0773f00f01d3f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f00f01d3f0000803f00000000000000000000000000000000000000000000000000000000
- m_Bindpose: []
- textureRect:
- serializedVersion: 2
- x: 3962
- y: 5054
- width: 130
- height: 130
- textureRectOffset: {x: 0, y: 0}
- atlasRectOffset: {x: -1, y: -1}
- settingsRaw: 0
- uvTransform: {x: 215, y: 4027, z: 215, w: 5119}
- downscaleMultiplier: 1
- m_AtlasRD:
- serializedVersion: 3
- texture: {fileID: -8328923581568760697, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
- alphaTexture: {fileID: 0}
- secondaryTextures: []
- m_SubMeshes:
- - serializedVersion: 2
- firstByte: 0
- indexCount: 6
- topology: 0
- baseVertex: 0
- firstVertex: 0
- vertexCount: 4
- localAABB:
- m_Center: {x: 0, y: 0, z: 0}
- m_Extent: {x: 0, y: 0, z: 0}
- m_IndexBuffer: 000001000200020001000300
- m_VertexData:
- serializedVersion: 3
- m_VertexCount: 4
- m_Channels:
- - stream: 0
- offset: 0
- format: 0
- dimension: 3
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 1
- offset: 0
- format: 0
- dimension: 2
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 0
- offset: 0
- format: 0
- dimension: 0
- - stream: 1
- offset: 8
- format: 0
- dimension: 4
- - stream: 1
- offset: 24
- format: 10
- dimension: 4
- m_DataSize: 208
- _typelessdata: 6bca9abe6bca9a3e000000006bca9a3e6bca9a3e000000006bca9abe6bca9abe000000006bca9a3e6bca9abe0000000000a0773f0000223f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f0000223f0000803f0000000000000000000000000000000000000000000000000000000000a0773f00f01d3f0000803f0000000000000000000000000000000000000000000000000000000000c07f3f00f01d3f0000803f00000000000000000000000000000000000000000000000000000000
- m_Bindpose: []
- textureRect:
- serializedVersion: 2
- x: 3962
- y: 5054
- width: 130
- height: 130
- textureRectOffset: {x: 0, y: 0}
- atlasRectOffset: {x: -1, y: -1}
- settingsRaw: 0
- uvTransform: {x: 215, y: 4027, z: 215, w: 5119}
- downscaleMultiplier: 1
- m_PhysicsShape: []
- m_Bones: []
- m_SpriteID: db22083879843b843b69dc1550fe5bfc
diff --git a/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta b/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta
deleted file mode 100644
index 2fde69665..000000000
--- a/Assets/Resources/Art/Obj/变速箱唱片齿轮.asset.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f33b33323f3c1314dbd795a207653ce0
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 21300000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Resources/Art/Obj/变速箱唱片齿轮.png b/Assets/Resources/Art/Obj/变速箱唱片齿轮.png
new file mode 100644
index 000000000..bacb269ab
--- /dev/null
+++ b/Assets/Resources/Art/Obj/变速箱唱片齿轮.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:229bae569219c5053bab15e5843cb5cc7ec41eeb88d36df6b19e42707ca28ca1
+size 321051
diff --git a/Assets/Resources/Art/Obj/变速箱唱片齿轮.png.meta b/Assets/Resources/Art/Obj/变速箱唱片齿轮.png.meta
new file mode 100644
index 000000000..6fd228a2e
--- /dev/null
+++ b/Assets/Resources/Art/Obj/变速箱唱片齿轮.png.meta
@@ -0,0 +1,153 @@
+fileFormatVersion: 2
+guid: cf019836beacf564d88f6aaef018a4ba
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 0
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 1
+ mipBias: 0
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
+ nPOTScale: 0
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 1
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 300
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 1
+ spriteTessellationDetail: -1
+ textureType: 8
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID: 5e97eb03825dee720800000000000000
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Resources/Shader/PeipeiFixScene.meta b/Assets/Resources/Shader/PeipeiFixScene.meta
index c3eddaeb8..cc29d5466 100644
--- a/Assets/Resources/Shader/PeipeiFixScene.meta
+++ b/Assets/Resources/Shader/PeipeiFixScene.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7bb31685ad654644f97f10b4f639a0b7
+guid: 3ea156cdaac3b80468a711a281e20a70
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
index 7e7ad33d5..6d7008374 100644
--- a/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
+++ b/Assets/Resources/Yarn/FP_Shitou1/Stage2_提速.yarn
@@ -316,7 +316,7 @@ me: 那来吧。在调整之前…
让我看看，你现在能跑多快。
shitou: 收到~
shitou: 呜——！
-<>
+<>
//石头加起速来，引擎轰鸣着达到了跑到了某个速度。#auto_next
//<>
me: 9800转…好高啊。
diff --git a/Assets/Scenes/ExpressFixScene.unity b/Assets/Scenes/ExpressFixScene.unity
index 2013666fa..e76dbf3be 100644
--- a/Assets/Scenes/ExpressFixScene.unity
+++ b/Assets/Scenes/ExpressFixScene.unity
@@ -123,115 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
---- !u!1 &1743094
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1743095}
- - component: {fileID: 1743097}
- - component: {fileID: 1743096}
- 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 &1743095
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1743094}
- 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 &1743096
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1743094}
- 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 &1743097
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1743094}
- 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: 13
- 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 &13903365
GameObject:
m_ObjectHideFlags: 0
@@ -352,6 +243,115 @@ Material:
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
+--- !u!1 &52857842
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 52857843}
+ - component: {fileID: 52857845}
+ - component: {fileID: 52857844}
+ 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 &52857843
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 52857842}
+ 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 &52857844
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 52857842}
+ 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.5
+ initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+ discIdx: 0
+ childGear: {fileID: 0}
+ targetSpeed: 0
+ speed: 0
+--- !u!212 &52857845
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 52857842}
+ 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: 13
+ 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 &70067075
GameObject:
m_ObjectHideFlags: 0
@@ -460,14 +460,14 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 129905458}
serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: -0.3907311, w: 0.9205049}
+ m_LocalRotation: {x: -0, y: -0, z: -0.6074081, w: 0.79439}
m_LocalPosition: {x: -0.533, y: -0.255, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 3017918740439763412}
m_Father: {fileID: 657112469}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: -46}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: -74.805}
--- !u!1001 &154381820
PrefabInstance:
m_ObjectHideFlags: 0
@@ -764,10 +764,10 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 1
m_Children:
- - {fileID: 1743095}
- - {fileID: 1522393038}
- - {fileID: 1479259133}
- - {fileID: 464823932}
+ - {fileID: 609244613}
+ - {fileID: 2121862245}
+ - {fileID: 52857843}
+ - {fileID: 2067817005}
m_Father: {fileID: 657112469}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!21 &200439710
@@ -1375,6 +1375,115 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &358212954
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 358212955}
+ - component: {fileID: 358212957}
+ - component: {fileID: 358212956}
+ m_Layer: 0
+ m_Name: Panel Shaft1
+ m_TagString: Shaft
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &358212955
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358212954}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.015, y: 0.883, 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 &358212956
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358212954}
+ 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.4
+ initSprite: {fileID: -5248008505966526047, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
+ discIdx: 0
+ childGear: {fileID: 0}
+ targetSpeed: 0
+ speed: 0
+--- !u!212 &358212957
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 358212954}
+ 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: 13
+ 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 &363642008
GameObject:
m_ObjectHideFlags: 0
@@ -1760,115 +1869,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &464823931
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 464823932}
- - component: {fileID: 464823934}
- - component: {fileID: 464823933}
- 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 &464823932
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 464823931}
- 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 &464823933
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 464823931}
- 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 &464823934
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 464823931}
- 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: 13
- 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 &466676742
GameObject:
m_ObjectHideFlags: 0
@@ -2369,6 +2369,115 @@ Transform:
- {fileID: 8292692516755928814}
m_Father: {fileID: 657112469}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &609244612
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 609244613}
+ - component: {fileID: 609244615}
+ - component: {fileID: 609244614}
+ 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 &609244613
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609244612}
+ 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 &609244614
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609244612}
+ 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 &609244615
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 609244612}
+ 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: 13
+ 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 &657112468
GameObject:
m_ObjectHideFlags: 0
@@ -2432,7 +2541,8 @@ MonoBehaviour:
- {x: 0, y: 0, z: -6.878}
- {x: 0, y: 0, z: 20}
needleDuration: 1.5
- initSpeed: 0.15
+ isAvailable: 0
+ initSpeed: 0.05
--- !u!1 &695150750
GameObject:
m_ObjectHideFlags: 0
@@ -2869,9 +2979,9 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- - {fileID: 1689770334}
- - {fileID: 1959713624}
- - {fileID: 801997356}
+ - {fileID: 358212955}
+ - {fileID: 961056072}
+ - {fileID: 953682127}
m_Father: {fileID: 657112469}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &709691613
@@ -3931,115 +4041,6 @@ Material:
- _WorldTilingOffset: {r: 0, g: 0, b: 0, a: 0}
- _WorldTilingScale: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []
---- !u!1 &801997355
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 801997356}
- - component: {fileID: 801997358}
- - component: {fileID: 801997357}
- 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 &801997356
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 801997355}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.007, y: -0.898, 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 &801997357
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 801997355}
- 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: 1
- initRadius: 0.4
- initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
- discIdx: 0
- childGear: {fileID: 0}
- targetSpeed: 0
- speed: 0
---- !u!212 &801997358
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 801997355}
- 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: 13
- 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 &802161902
GameObject:
m_ObjectHideFlags: 0
@@ -4275,6 +4276,224 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
+--- !u!1 &953682126
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 953682127}
+ - component: {fileID: 953682129}
+ - component: {fileID: 953682128}
+ 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 &953682127
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953682126}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.007, y: -0.898, 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 &953682128
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953682126}
+ 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: 1
+ initRadius: 0.4
+ initSprite: {fileID: -611960561148999933, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
+ discIdx: 0
+ childGear: {fileID: 0}
+ targetSpeed: 0
+ speed: 0
+--- !u!212 &953682129
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 953682126}
+ 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: 13
+ 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 &961056071
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 961056072}
+ - component: {fileID: 961056074}
+ - component: {fileID: 961056073}
+ 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 &961056072
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 961056071}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: -0.007, y: -0.076, 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 &961056073
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 961056071}
+ 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 &961056074
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 961056071}
+ 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: 13
+ 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 &1023239655
GameObject:
m_ObjectHideFlags: 3
@@ -4459,7 +4678,6 @@ Transform:
m_Children:
- {fileID: 1015381349462535075}
- {fileID: 8413601979190625454}
- - {fileID: 9140135230840944249}
- {fileID: 518000626}
- {fileID: 234711893}
- {fileID: 885292092}
@@ -4481,20 +4699,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
engineConfig:
- gearSpeed: 0.1
+ gearSpeed: 0.05
speedRate: 15
pullCount: 10
- pullMaxSpeed: 1.2
returnSpeed: 5
isAvailable: 0
isPullActive: 0
- curSpeed: 0.1
+ curSpeed: 0
targetSpeed: 0.95
+ coverMoveDuration: 2
+ coverMoveDistance: 2.8
updateSpeedEvent:
m_PersistentCalls:
m_Calls: []
- coverMoveDuration: 2
- coverMoveDistance: 2.8
--- !u!1 &1115166320
GameObject:
m_ObjectHideFlags: 0
@@ -5136,115 +5353,6 @@ SpriteRenderer:
m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0
---- !u!1 &1479259132
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1479259133}
- - component: {fileID: 1479259135}
- - component: {fileID: 1479259134}
- 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 &1479259133
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1479259132}
- 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 &1479259134
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1479259132}
- 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.5
- initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
- discIdx: 0
- childGear: {fileID: 0}
- targetSpeed: 0
- speed: 0
---- !u!212 &1479259135
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1479259132}
- 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: 13
- 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 &1502187942
GameObject:
m_ObjectHideFlags: 0
@@ -5338,115 +5446,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1502187942}
m_CullTransparentMesh: 1
---- !u!1 &1522393037
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1522393038}
- - component: {fileID: 1522393040}
- - component: {fileID: 1522393039}
- 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 &1522393038
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1522393037}
- 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 &1522393039
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1522393037}
- 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: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
- discIdx: 0
- childGear: {fileID: 0}
- targetSpeed: 0
- speed: 0
---- !u!212 &1522393040
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1522393037}
- 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: 13
- 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!1001 &1538548679
PrefabInstance:
m_ObjectHideFlags: 0
@@ -5459,6 +5458,10 @@ PrefabInstance:
propertyPath: m_Name
value: ProgressBarGridCircular_RoundThin
objectReference: {fileID: 0}
+ - target: {fileID: 2606495908852442944, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 2606495908852442975, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3}
propertyPath: m_Pivot.x
value: 0.5
@@ -5597,11 +5600,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6771085378564992114, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3}
propertyPath: maxValue
- value: 50
+ value: 17000
objectReference: {fileID: 0}
- target: {fileID: 6771085378564992114, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3}
propertyPath: currentValue
- value: 1
+ value: 1000
objectReference: {fileID: 0}
- target: {fileID: 8174416950032976404, guid: 82bf1147d291a0d49b9d7bd42eef166a, type: 3}
propertyPath: m_SizeDelta.x
@@ -5763,115 +5766,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
---- !u!1 &1689770333
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1689770334}
- - component: {fileID: 1689770336}
- - component: {fileID: 1689770335}
- m_Layer: 0
- m_Name: Panel Shaft1
- m_TagString: Shaft
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &1689770334
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1689770333}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.015, y: 0.883, 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 &1689770335
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1689770333}
- 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.4
- initSprite: {fileID: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
- discIdx: 0
- childGear: {fileID: 0}
- targetSpeed: 0
- speed: 0
---- !u!212 &1689770336
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1689770333}
- 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: 13
- 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 &1720794381
GameObject:
m_ObjectHideFlags: 0
@@ -6473,115 +6367,6 @@ BoxCollider2D:
serializedVersion: 2
m_Size: {x: 1, y: 1}
m_EdgeRadius: 0
---- !u!1 &1959713623
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 1959713624}
- - component: {fileID: 1959713626}
- - component: {fileID: 1959713625}
- 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 &1959713624
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1959713623}
- serializedVersion: 2
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -0.007, y: -0.076, 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 &1959713625
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1959713623}
- 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 &1959713626
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1959713623}
- 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: 13
- 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 &1976470784
GameObject:
m_ObjectHideFlags: 0
@@ -6956,6 +6741,115 @@ SpriteMask:
m_BackSortingOrder: 59
m_IsCustomRangeActive: 1
m_SpriteSortPoint: 0
+--- !u!1 &2067817004
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2067817005}
+ - component: {fileID: 2067817007}
+ - component: {fileID: 2067817006}
+ 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 &2067817005
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2067817004}
+ 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 &2067817006
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2067817004}
+ 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 &2067817007
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2067817004}
+ 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: 13
+ 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 &2091261678
Material:
serializedVersion: 8
@@ -7420,6 +7314,115 @@ RectTransform:
m_CorrespondingSourceObject: {fileID: 2064460273118752238, guid: ab166642babe53e4993fa1bd9bd57204, type: 3}
m_PrefabInstance: {fileID: 2104582589}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &2121862244
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2121862245}
+ - component: {fileID: 2121862247}
+ - component: {fileID: 2121862246}
+ 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 &2121862245
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2121862244}
+ 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 &2121862246
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2121862244}
+ 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: 4483447099526014788, guid: 6de0a74e5b5268b4998dc7a5c687fb95, type: 3}
+ discIdx: 0
+ childGear: {fileID: 0}
+ targetSpeed: 0
+ speed: 0
+--- !u!212 &2121862247
+SpriteRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2121862244}
+ 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: 13
+ 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 &2144716741
GameObject:
m_ObjectHideFlags: 0
@@ -8043,7 +8046,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!4 &1015381349462535075
Transform:
m_ObjectHideFlags: 0
@@ -11239,23 +11242,6 @@ Transform:
m_Children: []
m_Father: {fileID: 1256907108225840196}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &6617545466239103765
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 9140135230840944249}
- - component: {fileID: 7668019597992249737}
- m_Layer: 0
- m_Name: "\u62C9\u6746\u6C60"
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
--- !u!1 &6673533354654210576
GameObject:
m_ObjectHideFlags: 0
@@ -11911,58 +11897,6 @@ Transform:
m_Children: []
m_Father: {fileID: 5449320178873640439}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!212 &7668019597992249737
-SpriteRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6617545466239103765}
- 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: 4
- m_Sprite: {fileID: 5731250001562730576, guid: 149a798e8f987264f82beb4f4052eb5e, type: 3}
- m_Color: {r: 1, g: 1, b: 1, a: 1}
- m_FlipX: 0
- m_FlipY: 0
- m_DrawMode: 0
- m_Size: {x: 3.2232559, y: 3.027907}
- m_AdaptiveModeThreshold: 0.5
- m_SpriteTileMode: 0
- m_WasSpriteAssigned: 1
- m_MaskInteraction: 0
- m_SpriteSortPoint: 0
--- !u!1 &7718384502955250287
GameObject:
m_ObjectHideFlags: 0
@@ -12724,21 +12658,6 @@ Transform:
- {fileID: 488146692}
m_Father: {fileID: 1223292340}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!4 &9140135230840944249
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 6617545466239103765}
- serializedVersion: 2
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -3.1993022, y: 2.505116, z: 0}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_ConstrainProportionsScale: 0
- m_Children: []
- m_Father: {fileID: 1112213369}
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &9210352354887959608
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12753,7 +12672,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4214753503693131867, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7037918505330246345, guid: 13f00ab6092291d49a9312e52873d80b, type: 3}
propertyPath: field of view
diff --git a/Assets/Scenes/PeipeiFixScene.meta b/Assets/Scenes/PeipeiFixScene.meta
index c3eddaeb8..2a0be3986 100644
--- a/Assets/Scenes/PeipeiFixScene.meta
+++ b/Assets/Scenes/PeipeiFixScene.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7bb31685ad654644f97f10b4f639a0b7
+guid: f4b496823f39c60419769be9715cef70
folderAsset: yes
DefaultImporter:
externalObjects: {}
diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs
index 1eaf67b11..cdf5f9cf4 100644
--- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs
+++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs
@@ -182,17 +182,12 @@ namespace AibisDream.FixSystem
// 切换相机
yield return CameraKit.Instance.SwitchCamera(CameraEnum.Engine);
- // 激活交互
- engineSystem.EnableSystem();
}
public IEnumerator Exit()
{
var bodyModuleSystem = FixSystemCenter.SystemDic.Get();
bodyModuleSystem.ResetPlug();
- // 关闭交互
- var engineSystem = FixSystemCenter.SystemDic.Get();
- engineSystem.DisableSystem();
yield break;
}
}
diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
index a9beacabc..a1ba9c66c 100644
--- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
+++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs
@@ -13,6 +13,7 @@ namespace AibisDream
public class EngineSystem : MonoBehaviour
{
private StaticGear _centerGear;
+ private SpriteRenderer _cover;
[Header("系统配置")] public EngineConfig engineConfig;
public bool isAvailable;
@@ -20,7 +21,9 @@ namespace AibisDream
private bool _isSuccess;
public float curSpeed;
- public float targetSpeed=0.95f;
+ public float targetSpeed = 0.95f;
+ [SerializeField] private float coverMoveDuration = 5f;
+ [SerializeField] private float coverMoveDistance = 2.8f;
[HideInInspector] public UnityEvent updateSpeedEvent = new();
private void Awake()
@@ -28,7 +31,8 @@ namespace AibisDream
FixSystemCenter.SystemDic.Register(this);
_centerGear = transform.Find("中央齿轮").GetComponent();
_centerGear.initSpeed = engineConfig.gearSpeed;
-
+ _cover = transform.Find("Cover").GetComponent();
+
// 注册相机
var virtualCam = transform.Find("Engine Camera").GetComponentInChildren();
CameraKit.Instance.RegisterCamera(CameraEnum.Engine, virtualCam);
@@ -74,7 +78,7 @@ namespace AibisDream
///
/// 开启系统交互
///
- public void EnableSystem()
+ private void EnableSystem()
{
isAvailable = true;
}
@@ -82,10 +86,51 @@ namespace AibisDream
///
/// 关闭系统交互
///
- public void DisableSystem()
+ private void DisableSystem()
{
isAvailable = false;
}
+
+ ///
+ /// 打开盖板
+ /// 关闭系统交互
+ ///
+ /// 动画序列
+ public Tween OpenCover()
+ {
+ AudioManager.PlayLoop2Audio("amb_shitou_engine");
+
+ var sq = DOTween.Sequence();
+ // 盖板上移
+ var moveDis = new Vector3(0, coverMoveDistance, 0);
+ sq.Join(_cover.transform.DOBlendableMoveBy(moveDis, coverMoveDuration));
+ // 盖板淡出
+ sq.Join(_cover.DOFade(0, coverMoveDuration));
+
+ // 为引擎系统解锁
+ sq.OnComplete(EnableSystem);
+
+ return sq;
+ }
+
+ ///
+ /// 关闭盖板
+ ///
+ /// 动画序列
+ public Tween CloseCover()
+ {
+ AudioManager.PauseLoop2Audio();
+ var sq = DOTween.Sequence();
+ sq.Join(_cover.DOFade(1, coverMoveDuration));
+
+ var moveDis = new Vector3(0, -coverMoveDistance, 0);
+ sq.Join(_cover.transform.DOBlendableMoveBy(moveDis, coverMoveDuration));
+
+ // 锁定引擎系统
+ sq.OnComplete(DisableSystem);
+
+ return sq;
+ }
}
[Serializable]
@@ -94,7 +139,6 @@ namespace AibisDream
[Header("齿轮基础速度")] public float gearSpeed;
[Header("齿轮速度倍率")] public float speedRate;
[Header("拉满几次到全速")] public float pullCount;
- [Header("拉绳最大速度")] public float pullMaxSpeed;
[Header("拉绳回缩速度")] public float returnSpeed;
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs b/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs
index 02920c84a..4fb9de5e6 100644
--- a/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs
+++ b/Assets/Scripts/MiniGame/Engine/EngineYarnCommand.cs
@@ -1,6 +1,5 @@
using System.Collections;
using AibisDream.FixSystem;
-using UnityEngine;
using Yarn.Unity;
namespace AibisDream
@@ -13,16 +12,14 @@ namespace AibisDream
[YarnCommand("open_engine_cover")]
public static IEnumerator OpenEngineCover()
{
- Debug.LogWarning("打开引擎盖命令已废弃，请尽快删除");
- yield break;
+ yield return EngineSystem.OpenCover();
}
// 打开引擎盖
[YarnCommand("close_engine_cover")]
public static IEnumerator CloseEngineCover()
{
- Debug.LogWarning("关闭引擎盖命令已废弃，请尽快删除");
- yield break;
+ yield return EngineSystem.CloseCover();
}
///
diff --git a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
index b5cd7a79f..22f405b13 100644
--- a/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
+++ b/Assets/Scripts/MiniGame/Engine/SpeedDashboard.cs
@@ -9,22 +9,21 @@ namespace AibisDream
private EngineSystem _engineSystem;
private ProgressBarGridCircular progress;
- private static readonly int Progress1 = Shader.PropertyToID("_Progress");
+ private static readonly int VibrateFade = Shader.PropertyToID("_VibrateFade");
private void Awake()
- {
+ {
_engineSystem = transform.parent.GetComponent();
_material = _engineSystem.transform.Find("心脏引擎").GetComponent().material;
- progress=FindObjectOfType();
+ progress = FindObjectOfType();
_engineSystem.updateSpeedEvent.AddListener(OnSpeedChange);
}
private void OnSpeedChange(float originSpeed, float speedScale)
{
- _material.SetFloat("_VibrateFade", originSpeed);
- progress.CurrentValue=Mathf.RoundToInt(originSpeed * 50);
- //_material.SetFloat(Progress1, originSpeed);
+ _material.SetFloat(VibrateFade, originSpeed);
+ progress.CurrentValue = Mathf.RoundToInt(originSpeed * 16000 + 1000);
}
}
}
\ No newline at end of file
diff --git a/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json b/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json
index 0f868d069..e16889638 100644
--- a/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.json
+++ b/Assets/StreamingAssets/LevelData/GearSystem/stone_day1_2.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":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/身体维修界面-扫描/心脏齿轮D"},{"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/身体维修界面-扫描/心脏齿轮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.4,"gearProp":"NewGear","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":false,"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":false,"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":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":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/身体维修界面-扫描/心脏齿轮D"},{"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/身体维修界面-扫描/心脏齿轮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.4,"gearProp":"NewGear","isGearBroken":false,"isDisc":false,"discIdx":0,"shaftPos":{"x":-0.015,"y":0.883,"z":0.0},"gearPicPath":"Art/Fix/Stone/身体维修界面导出_1227/高级齿轮A"},{"shaftName":"Panel Shaft2","shaftType":2,"targetSpeed":0.0,"hasChildGear":false,"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":false,"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
diff --git a/Assets/StreamingAssets/LevelData/GearSystem/temp.json b/Assets/StreamingAssets/LevelData/GearSystem/temp.json
index 6dc5e561c..d4de7c8d7 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":2,"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/变速箱唱片齿轮"},{"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/身体维修界面-扫描/心脏齿轮D"},{"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/身体维修界面-扫描/心脏齿轮D"},{"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":[{"shaftName":"Panel Shaft1","shaftType":2,"targetSpeed":0.0,"hasChildGear":true,"radius":0.4,"gearProp":"NewGear","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":false,"radius":0.3,"gearProp":"","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":false,"radius":0.4,"gearProp":"","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