diff --git a/Assets/Prefabs/ClueItemPrefab.prefab b/Assets/Prefabs/ClueItemPrefab.prefab index f28404010..87c04c397 100644 --- a/Assets/Prefabs/ClueItemPrefab.prefab +++ b/Assets/Prefabs/ClueItemPrefab.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &45499603671335862 RectTransform: m_ObjectHideFlags: 0 @@ -29,8 +29,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7924894876819984995} + m_Children: [] m_Father: {fileID: 4993650456917624668} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -93,7 +92,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1604617519185134939 RectTransform: m_ObjectHideFlags: 0 @@ -264,6 +263,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7924894876819984995} - {fileID: 45499603671335862} - {fileID: 1604617519185134939} - {fileID: 6887531889344103689} @@ -302,7 +302,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: -4384947365909365838, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -610,12 +610,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 45499603671335862} + m_Father: {fileID: 4993650456917624668} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: -100, y: 55.8} + m_SizeDelta: {x: -200, y: -100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8499524202528292966 CanvasRenderer: @@ -708,7 +708,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: 0, y: 6.3168945, z: -199.4336, w: 7.2193604} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 diff --git a/Assets/Prefabs/PunchTape.prefab b/Assets/Prefabs/PunchTape.prefab index 6ee9e0c9d..a7e8c6207 100644 --- a/Assets/Prefabs/PunchTape.prefab +++ b/Assets/Prefabs/PunchTape.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 100, y: 43} + m_AnchoredPosition: {x: 144, y: 66} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3996216564447825314 @@ -99,7 +99,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 @@ -128,7 +128,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -44.701233, y: -6.9536133, z: -256.287, w: 9.933594} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -201,7 +201,7 @@ MonoBehaviour: clueImageUI: {fileID: 0} categoryText: {fileID: 6752808136549648365} nameText: {fileID: 1936171647708474621} - stateText: {fileID: 2527786159571640101} + stateText: {fileID: 0} used: 0 finished: {fileID: 3491718056792811219} --- !u!1 &3491718056792811219 @@ -482,7 +482,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: -4384947365909365838, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -509,7 +509,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7634610201877570304 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Art/Fix/Peipei/打印机底部.png b/Assets/Resources/Art/Fix/Peipei/打印机底部.png new file mode 100644 index 000000000..c7bce0393 --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/打印机底部.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b194aa31c15d2b27aaf8b120ae25a810b51c29bb578768a6e900e0fbd445dc22 +size 76086 diff --git a/Assets/Resources/Art/Fix/Peipei/打印机底部.png.meta b/Assets/Resources/Art/Fix/Peipei/打印机底部.png.meta new file mode 100644 index 000000000..78ae104db --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/打印机底部.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 2e0f04125f4b770498368672c050416e +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: 200 + 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: 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/Yarn/Re_LTS_Peipeiday1/Eye.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn index 6d10bda5f..cf02105d1 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn @@ -65,11 +65,7 @@ colorID: 6 group:视觉检查 position: 16,782 --- -// me: 为什么视觉模块会从记忆调用数据呢…奇怪了。 -// me: 我怎么也找不到…… -// <> -// <> -// peipei: 医生…对不起…我没有主动告诉你我看不见颜色。 + peipei: 还有一件事，我最好还是主动告诉你。 me: 啊…什么？ peipei: 我不是故意要瞒着的…只是我还以为，这不是什么大问题。 @@ -82,10 +78,9 @@ me: 啊？ peipei: 我其实能够以某种方式看到一些颜色…… <> <> -<> -<> -<> +<> <> +<> <> <> me: 记忆…向视觉发送了数据？然后生成了这些颜色？ @@ -193,10 +188,9 @@ peipei: 坏了！我还有一张海报没出…… peipei: 啊……我差点忘了。我来这里就是为了这个。 <> <> -<> -<> -<> +<> <> +<> <> ->放入收藏夹 <> @@ -230,9 +224,9 @@ peipei: 我还是把它养死了。 peipei: 我愧疚了好久，那时的我真的以为小草可以长成一棵树。 <> <> -<> +<> <> -<> +<> <> <> ->放入收藏夹 diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn index 6bdeba561..cd052d417 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn @@ -19,7 +19,7 @@ colorID: 8 position: -2,-3039 --- <> -<> +<> <> <> <> @@ -34,7 +34,7 @@ colorID: 8 position: 240,-2640 --- <> -<> +<> <> <> <> @@ -49,7 +49,7 @@ colorID: 8 position: 480,-3040 --- <> -<> +<> <> <> <> @@ -67,7 +67,7 @@ colorID: 8 position: 240,-2840 --- <> -<> +<> <> <> <> @@ -83,7 +83,7 @@ colorID: 8 position: 240,-3040 --- <> -<> +<> <> <> <> @@ -103,7 +103,7 @@ colorID: 8 position: 0,-2840 --- <> -<> +<> <> <> <> @@ -119,7 +119,7 @@ position: 480,-2840 //待编辑 //佩佩很害怕，她意识到了原来的颜色再也回不来了 <> -<> +<> <> <> <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn index 45b2f0a76..6d723415c 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn @@ -124,41 +124,32 @@ position: 251,-1150 <> <> <> - <> 【占位】进入维修后，你想要进UF内部看一看，但是UF不允许，UF只允许调取最近1h的记录 【占位】好在这也够了，你调取了上一次绘图的记录，生成了三个记忆索引 - + <> + <> + ->打印记忆卡带 <> - <> - <> - <> - <> - <> - <> + <> <> <> ->放入收藏夹 <> <> - <> - <> - <> - <> + <> <> <> ->放入收藏夹 <> <> - <> - <> - <> - <> + <> <> <> ->放入收藏夹 <> 【占位】原来UF是用记忆来绘图的，有线索就好办了，去记忆看看 <> + <> <> <> === diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject index f6fcc7227..016b7ab29 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarnproject @@ -1,7 +1,7 @@ -{ +{ "projectFileVersion": 2, "sourceFiles": [ - "**/*.yarn" + "*.yarn" ], "excludeFiles": [ "**/*~/*" diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 99eea1ac2..df6b53634 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -484,6 +484,44 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 28197533} m_CullTransparentMesh: 1 +--- !u!1 &35416254 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 35416255} + m_Layer: 5 + m_Name: "\u6253\u5370\u673A" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &35416255 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 35416254} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2029038284} + - {fileID: 2028795587} + - {fileID: 908121221} + m_Father: {fileID: 755572874} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1431, y: -27.03003} + m_SizeDelta: {x: 936.6526, y: 886} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &53832470 GameObject: m_ObjectHideFlags: 0 @@ -12122,6 +12160,7 @@ RectTransform: - {fileID: 503082897} - {fileID: 748395815} - {fileID: 1597388063} + - {fileID: 35416255} - {fileID: 142983754} - {fileID: 1810834547} - {fileID: 1687435156} @@ -14751,6 +14790,81 @@ Material: - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _ShineColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &908121220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 908121221} + - component: {fileID: 908121223} + - component: {fileID: 908121222} + m_Layer: 0 + m_Name: "\u6253\u5370\u673A\u9876\u90E8" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &908121221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908121220} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 0.5575687} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 35416255} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 365.18628, y: 0} + m_SizeDelta: {x: 148, y: 886} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &908121222 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908121220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2e0f04125f4b770498368672c050416e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &908121223 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 908121220} + m_CullTransparentMesh: 1 --- !u!1 &911086723 GameObject: m_ObjectHideFlags: 0 @@ -20350,7 +20464,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!320 &1428720230 PlayableDirector: m_ObjectHideFlags: 0 @@ -23928,7 +24042,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1648045777 MonoBehaviour: m_ObjectHideFlags: 0 @@ -23944,11 +24058,11 @@ MonoBehaviour: interactiveLineSegmentPrefab: {fileID: 1631752023640685220, guid: 43e57126c498f174d9bca18cca08993e, type: 3} lineSegmentInfos: - Name: MemoryEye - StartTransform: {fileID: 2065708031} + StartTransform: {fileID: 1678197549} EndTransform: {fileID: 962974901} - Name: MemoryUF - StartTransform: {fileID: 2065708031} - EndTransform: {fileID: 633823202} + StartTransform: {fileID: 1678197549} + EndTransform: {fileID: 1841275529} physicLineSegmentPrefab: {fileID: 3614166255594274803, guid: befc2e1cb50eae541870ccb46e98e3ee, type: 3} --- !u!4 &1648045778 Transform: @@ -25409,6 +25523,60 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734431896} m_CullTransparentMesh: 1 +--- !u!1 &1792059973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1792059974} + - component: {fileID: 1792059975} + m_Layer: 0 + m_Name: PunchTapeSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1792059974 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792059973} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -2, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 224310790} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1792059975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1792059973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4075ea95a82355544862690e0de983bd, type: 3} + m_Name: + m_EditorClassIdentifier: + punchTapeMachine: {fileID: 35416255} + punchTape: {fileID: 2028795587} + stepInterval: 0.1 + stepDistance: 50 + stepPatterns: + - 0.3 + - 0.5 + - 0.2 + - 0.4 + - 0.6 --- !u!1 &1805580364 GameObject: m_ObjectHideFlags: 0 @@ -28119,6 +28287,156 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 6 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &2028795586 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2028795587} + - component: {fileID: 2028795589} + - component: {fileID: 2028795588} + m_Layer: 0 + m_Name: "\u6253\u5B54\u5E26 \u62F7\u8D1D" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2028795587 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2028795586} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 35416255} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -41, y: 0.3798828} + m_SizeDelta: {x: 863, y: 356} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2028795588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2028795586} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -2986145926630070827, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2028795589 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2028795586} + m_CullTransparentMesh: 1 +--- !u!1 &2029038283 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2029038284} + - component: {fileID: 2029038286} + - component: {fileID: 2029038285} + m_Layer: 0 + m_Name: "\u6253\u5370\u673A\u5E95\u90E8" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2029038284 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029038283} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 35416255} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 379.32642, y: 14.030029} + m_SizeDelta: {x: 178, y: 855} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2029038285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029038283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: -7927270990316304979, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2029038286 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2029038283} + m_CullTransparentMesh: 1 --- !u!1 &2042524897 GameObject: m_ObjectHideFlags: 0 @@ -30473,11 +30791,19 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -8694097954033824498, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -8653719598885068355, guid: fd04c28739017964789d58d573f9fabb, type: 3} propertyPath: m_Name value: "\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew" objectReference: {fileID: 0} - target: {fileID: -8653719598885068355, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8211477621981062317, guid: fd04c28739017964789d58d573f9fabb, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} @@ -30525,10 +30851,26 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 20.46 objectReference: {fileID: 0} + - target: {fileID: -5839002019461030505, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -5143836344916988375, guid: fd04c28739017964789d58d573f9fabb, type: 3} propertyPath: m_LocalPosition.x value: 22.179998 objectReference: {fileID: 0} + - target: {fileID: -4980994071838132522, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -3452483550018539159, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2829075397379242463, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1726817187330497252, guid: fd04c28739017964789d58d573f9fabb, type: 3} propertyPath: m_LocalPosition.x value: 20.46 @@ -30537,6 +30879,14 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 4.27 objectReference: {fileID: 0} + - target: {fileID: -344205433130034305, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1247287795504141591, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2081108609928723800, guid: fd04c28739017964789d58d573f9fabb, type: 3} propertyPath: m_LocalPosition.x value: 26.845003 @@ -30557,6 +30907,14 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -8.59 objectReference: {fileID: 0} + - target: {fileID: 4775588940142348668, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5205212452559263090, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7624651669314105752, guid: fd04c28739017964789d58d573f9fabb, type: 3} propertyPath: m_LocalPosition.x value: 26.76 @@ -30573,6 +30931,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -0.12 objectReference: {fileID: 0} + - target: {fileID: 8523364232566573439, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8942710833754221694, guid: fd04c28739017964789d58d573f9fabb, type: 3} propertyPath: m_LocalPosition.x value: 20.36 @@ -30581,6 +30943,10 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: -8.59 objectReference: {fileID: 0} + - target: {fileID: 9187444584596770705, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -31019,6 +31385,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 1912719094} + - targetCorrespondingSourceObject: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1792059974} - targetCorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 1841275529} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index bf4ba648d..83665575d 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -34428,7 +34428,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: 1060.164, y: 1195.7235, z: 0} + position: {x: 784.4909, y: 1193.2434, z: 0} dragSelection: customRenderer: {fileID: 0} line: diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs index 21e65d1a5..190eea076 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs @@ -9,7 +9,7 @@ namespace AibisDream private static BodyModuleSystem BodyModuleSystem => FixSystemCenter.SystemDic.Get(); private static OscilloscopeSystem OscilloscopeSystem => FixSystemCenter.SystemDic.Get(); - + private static PunchTapeSystem PunchTapeSystem => FixSystemCenter.SystemDic.Get(); [YarnCommand("SetModuleState_CantStopRunning")] public static void SetModuleState_CantStopRunning(string ModuleName,bool state) { @@ -142,5 +142,10 @@ namespace AibisDream { OscilloscopeSystem.StartCoroutine(OscilloscopeSystem.DisableDeepInButton()); } + [YarnCommand("PrintPunchTapes")] + public static IEnumerator PrintPunchTapes(int count) + { + yield return PunchTapeSystem.StartCoroutine(PunchTapeSystem.PrintPunchTapes(count)); + } } } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs index 695dd7abb..cfec5c8a0 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs @@ -197,7 +197,7 @@ namespace AibisDream.FixSystem public void MessageBoxSetText(string text) { _screenText.color = Color.white; // 默认文本颜色 - _screenText.text += text+"
"; + _screenText.text += text+"
"; } public void MessageBoxSetNull() { diff --git a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs new file mode 100644 index 000000000..51c934025 --- /dev/null +++ b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs @@ -0,0 +1,76 @@ +using System.Collections; +using System.Collections.Generic; +using DG.Tweening; +using UnityEngine; +using AibisDream.FixSystem; +using UnityEngine.UI; + +public class PunchTapeSystem : MonoBehaviour +{ + public RectTransform punchTapeMachine; + public RectTransform punchTape; + public float stepInterval = 0.1f; // Interval between each printing step + public float stepDistance = 0.5f; // Distance moved per step + public float[] stepPatterns = { 0.3f, 0.5f, 0.2f, 0.4f, 0.6f }; // Pattern of intervals to simulate rhythmic printing + + private void Awake() + { + FixSystemCenter.SystemDic.Register(this); + } + + public void Update() + { + if (Input.GetKeyDown(KeyCode.P)) + { + StartPrinting(2); + } + } + + public void StartPrinting(int tapeCount) + { + StartCoroutine(PrintPunchTapes(tapeCount)); + } + + public IEnumerator PrintPunchTapes(int tapeCount) + { + Vector3 machineStartPos = punchTapeMachine.anchoredPosition; + Vector3 tapeStartPos = punchTape.anchoredPosition; + Color tapeStartColor = punchTape.GetComponent().color; + + while (tapeCount > 0) + { + // Move the printer to x = 2 over 1 second + yield return punchTapeMachine.DOAnchorPos(new Vector2(-1252f, punchTapeMachine.anchoredPosition.y), 1f).WaitForCompletion(); + + // Gradually move the punch tape to x = -3.8 with rhythmic pattern + Vector2 targetPosition = new Vector2(796f, punchTape.anchoredPosition.y); + int patternIndex = 0; + + while (Vector2.Distance(punchTape.anchoredPosition, targetPosition) > stepDistance) + { + punchTape.anchoredPosition = Vector3.MoveTowards(punchTape.anchoredPosition, targetPosition, stepDistance); + yield return new WaitForSeconds(stepPatterns[patternIndex % stepPatterns.Length]); + patternIndex++; + } + + // Ensure exact final position + punchTape.anchoredPosition = targetPosition; + + // Fade out the punch tape over 1 second + yield return punchTape.GetComponent().DOFade(0f, 1f).WaitForCompletion(); + + // Reset the punch tape position and opacity + punchTape.anchoredPosition = tapeStartPos; + punchTape.GetComponent().color = tapeStartColor; + + // Decrement the tape count + tapeCount--; + } + + // Move the printer back to x = 0 over 1 second + yield return punchTapeMachine.DOAnchorPos(new Vector2(-1428.186f, punchTapeMachine.anchoredPosition.y), 1f).WaitForCompletion(); + } + +} + + diff --git a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs.meta b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs.meta new file mode 100644 index 000000000..34efb557d --- /dev/null +++ b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4075ea95a82355544862690e0de983bd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: