From f8958de8434b70b4f108ee89fde8572f496debd0 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Mon, 30 Dec 2024 17:45:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=9F=B3=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Audio/{BooomAudio => }/fixing_general.ogg | 0 .../Audio/{BooomAudio => }/fixing_general.ogg.meta | 0 .../mem_huoshan_1.ogg => mem_戈塔什诱惑.ogg} | 0 ...m_huoshan_1.ogg.meta => mem_戈塔什诱惑.ogg.meta} | 0 .../Audio/{mem_liuying3-1.ogg => mem_海边.ogg} | 0 .../{mem_liuying3-1.ogg.meta => mem_海边.ogg.meta} | 0 .../mem_huoshan_2.ogg => mem_英里生气.ogg} | 0 ...mem_huoshan_2.ogg.meta => mem_英里生气.ogg.meta} | 0 Assets/Resources/Audio/{BooomAudio => }/typing.ogg | 0 .../Audio/{BooomAudio => }/typing.ogg.meta | 0 Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn | 13 +++++++++---- Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn | 1 + Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn | 3 +++ Assets/Scenes/PeipeiFixScene.unity | 8 ++++---- .../FixSystemNew/BodyModule/OscilloscopeSystem.cs | 4 ++-- .../FixSystemNew/BodyModule/PunchTapeSystem.cs | 3 ++- 16 files changed, 21 insertions(+), 11 deletions(-) rename Assets/Resources/Audio/{BooomAudio => }/fixing_general.ogg (100%) rename Assets/Resources/Audio/{BooomAudio => }/fixing_general.ogg.meta (100%) rename Assets/Resources/Audio/{BooomAudio/mem_huoshan_1.ogg => mem_戈塔什诱惑.ogg} (100%) rename Assets/Resources/Audio/{BooomAudio/mem_huoshan_1.ogg.meta => mem_戈塔什诱惑.ogg.meta} (100%) rename Assets/Resources/Audio/{mem_liuying3-1.ogg => mem_海边.ogg} (100%) rename Assets/Resources/Audio/{mem_liuying3-1.ogg.meta => mem_海边.ogg.meta} (100%) rename Assets/Resources/Audio/{BooomAudio/mem_huoshan_2.ogg => mem_英里生气.ogg} (100%) rename Assets/Resources/Audio/{BooomAudio/mem_huoshan_2.ogg.meta => mem_英里生气.ogg.meta} (100%) rename Assets/Resources/Audio/{BooomAudio => }/typing.ogg (100%) rename Assets/Resources/Audio/{BooomAudio => }/typing.ogg.meta (100%) diff --git a/Assets/Resources/Audio/BooomAudio/fixing_general.ogg b/Assets/Resources/Audio/fixing_general.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/fixing_general.ogg rename to Assets/Resources/Audio/fixing_general.ogg diff --git a/Assets/Resources/Audio/BooomAudio/fixing_general.ogg.meta b/Assets/Resources/Audio/fixing_general.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/fixing_general.ogg.meta rename to Assets/Resources/Audio/fixing_general.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg b/Assets/Resources/Audio/mem_戈塔什诱惑.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg rename to Assets/Resources/Audio/mem_戈塔什诱惑.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg.meta b/Assets/Resources/Audio/mem_戈塔什诱惑.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_1.ogg.meta rename to Assets/Resources/Audio/mem_戈塔什诱惑.ogg.meta diff --git a/Assets/Resources/Audio/mem_liuying3-1.ogg b/Assets/Resources/Audio/mem_海边.ogg similarity index 100% rename from Assets/Resources/Audio/mem_liuying3-1.ogg rename to Assets/Resources/Audio/mem_海边.ogg diff --git a/Assets/Resources/Audio/mem_liuying3-1.ogg.meta b/Assets/Resources/Audio/mem_海边.ogg.meta similarity index 100% rename from Assets/Resources/Audio/mem_liuying3-1.ogg.meta rename to Assets/Resources/Audio/mem_海边.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg b/Assets/Resources/Audio/mem_英里生气.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg rename to Assets/Resources/Audio/mem_英里生气.ogg diff --git a/Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg.meta b/Assets/Resources/Audio/mem_英里生气.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/mem_huoshan_2.ogg.meta rename to Assets/Resources/Audio/mem_英里生气.ogg.meta diff --git a/Assets/Resources/Audio/BooomAudio/typing.ogg b/Assets/Resources/Audio/typing.ogg similarity index 100% rename from Assets/Resources/Audio/BooomAudio/typing.ogg rename to Assets/Resources/Audio/typing.ogg diff --git a/Assets/Resources/Audio/BooomAudio/typing.ogg.meta b/Assets/Resources/Audio/typing.ogg.meta similarity index 100% rename from Assets/Resources/Audio/BooomAudio/typing.ogg.meta rename to Assets/Resources/Audio/typing.ogg.meta diff --git a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn b/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn index 458e0536e..fcaae654d 100644 --- a/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn +++ b/Assets/Resources/Yarn/MemoryTest/MemoryTest.yarn @@ -1,4 +1,4 @@ -title: Start +title: Start tags: colorID: 8 position: 253,-2041 @@ -13,19 +13,24 @@ tags: <> <> <> -<> +<> <> -<> +<> <> <> <> +<> +<> +<> +<> + === title: End_memoryPaly tags: colorID: 3 position: -1,976 --- -<> +<> === title: UF绘图1 diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn index 9024d89af..429dc61bc 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn @@ -149,6 +149,7 @@ position: 480,-2840 <> <> <> + <> <> <> <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn index 2473f42ad..7d00e0a99 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Plug.yarn @@ -114,6 +114,7 @@ me: 佩佩，该放手了。 <> <> <> +<> <> <> <> @@ -140,6 +141,7 @@ position: 0,-2840 <> <> <> +<> <> <> <> @@ -164,6 +166,7 @@ position: 480,-2840 <> <> <> + <> <> <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index c7c8bc828..0bfdabe66 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -12864,7 +12864,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &659675442 MonoBehaviour: m_ObjectHideFlags: 0 @@ -32075,8 +32075,8 @@ MonoBehaviour: punchTapeMachine: {fileID: 35416255} punchTape: {fileID: 2028795587} blackPanel: {fileID: 964820569} - stepInterval: 0.05 - stepDistance: 50 + stepInterval: 0.08 + stepDistance: 24 stepPatterns: - 0.1 - 0.2 @@ -39770,7 +39770,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalPosition.x - value: -0.269 + value: -0.2 objectReference: {fileID: 0} - target: {fileID: 1369475798980233471, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs index feeca945c..a4ba60aa6 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs @@ -209,13 +209,13 @@ namespace AibisDream.FixSystem public IEnumerator EnableDeepInButton() { - yield return _deepinButton.GetTransform().DOLocalMoveX(0.5f, 0.5f).WaitForCompletion(); + yield return _deepinButton.GetTransform().DOLocalMoveX(0.35f, 0.5f).WaitForCompletion(); _deepinButton.SetActive(true); } public IEnumerator DisableDeepInButton() { - yield return _deepinButton.GetTransform().DOLocalMoveX(-0.1f, 0.5f).WaitForCompletion(); + yield return _deepinButton.GetTransform().DOLocalMoveX(-0.2f, 0.5f).WaitForCompletion(); _deepinButton.SetActive(false); } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs index e0885a40c..c83828495 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/PunchTapeSystem.cs @@ -5,6 +5,7 @@ using UnityEngine; using AibisDream.FixSystem; using UnityEngine.UI; using Unity.VisualScripting; +using AibisDream; public class PunchTapeSystem : MonoBehaviour { @@ -46,7 +47,7 @@ public class PunchTapeSystem : MonoBehaviour { // Move the printer to x = 2 over 1 second yield return punchTapeMachine.DOAnchorPos(new Vector2(-1252f, punchTapeMachine.anchoredPosition.y), 1f).WaitForCompletion(); - + AudioManager.RandomPlayInteraction("typing"); // Gradually move the punch tape to x = -3.8 with rhythmic pattern Vector2 targetPosition = new Vector2(796f, punchTape.anchoredPosition.y); int patternIndex = 0; From 3fd5f1bd39e797f3050cb0dcbf79e0887a945491 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Mon, 30 Dec 2024 18:46:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9clueboard=E9=80=80?= =?UTF-8?q?=E5=87=BA=E8=A1=A8=E7=8E=B0=EF=BC=8C=E5=92=8C=E7=9C=BC=E7=9D=9B?= =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9A=84=E8=A1=A8=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Art/Fix/Peipei/视觉盖子关闭.png | 3 + .../Art/Fix/Peipei/视觉盖子关闭.png.meta | 140 ++++++++++ .../Resources/Art/Fix/Peipei/视觉盖子打开.png | 3 + .../Art/Fix/Peipei/视觉盖子打开.png.meta | 140 ++++++++++ Assets/Resources/Art/Memory/英里生气.png | 4 +- Assets/Resources/Art/Obj/引导5.png | 4 +- .../Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn | 5 +- .../Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn | 1 + .../Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn | 2 + Assets/Scenes/PeipeiFixScene.unity | 257 ++++++++---------- Assets/Scenes/Persistence.unity | 132 +++++---- .../FixSystemNew/StateTransition/FixState.cs | 5 +- 12 files changed, 493 insertions(+), 203 deletions(-) create mode 100644 Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png create mode 100644 Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png.meta create mode 100644 Assets/Resources/Art/Fix/Peipei/视觉盖子打开.png create mode 100644 Assets/Resources/Art/Fix/Peipei/视觉盖子打开.png.meta diff --git a/Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png b/Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png new file mode 100644 index 000000000..df3be13dd --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02045a380783fef73f3488dcc851c7ce73ec90883ccd518be2cf4c9a925cc126 +size 140168 diff --git a/Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png.meta b/Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png.meta new file mode 100644 index 000000000..8e2630a5a --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/视觉盖子关闭.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: 76a158ff7cdf41045b3cc2d58a7f9218 +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/Art/Fix/Peipei/视觉盖子打开.png b/Assets/Resources/Art/Fix/Peipei/视觉盖子打开.png new file mode 100644 index 000000000..128706e80 --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/视觉盖子打开.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:083e8c6626352f70a3ece3afb52f3c285f4def3f3952212a381b72363c807281 +size 190895 diff --git a/Assets/Resources/Art/Fix/Peipei/视觉盖子打开.png.meta b/Assets/Resources/Art/Fix/Peipei/视觉盖子打开.png.meta new file mode 100644 index 000000000..d1bc91e98 --- /dev/null +++ b/Assets/Resources/Art/Fix/Peipei/视觉盖子打开.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: c8cdacb5c2304ef40b731e9fc029020c +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/Art/Memory/英里生气.png b/Assets/Resources/Art/Memory/英里生气.png index 5c559790d..49e5ab810 100644 --- a/Assets/Resources/Art/Memory/英里生气.png +++ b/Assets/Resources/Art/Memory/英里生气.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed6b66cc4a0196b9054745aafeb3c75f3d39d1926be12d617813def5cd8e50ad -size 403751 +oid sha256:12f565704134a7476df5ba979952792b89c8c666e3f9577770fdb4b0d0cf7a8e +size 771642 diff --git a/Assets/Resources/Art/Obj/引导5.png b/Assets/Resources/Art/Obj/引导5.png index d276df53d..f87ed4ff8 100644 --- a/Assets/Resources/Art/Obj/引导5.png +++ b/Assets/Resources/Art/Obj/引导5.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49ff56e3e531cb4fba021203d9fce4241410c94870f2c131cd1e841691dc65b4 -size 44128 +oid sha256:c9f43c5ac4cc2c38d5a1ad4f938586fdb7fa18601d960d257cf3884d9d9b9e31 +size 70696 diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn index b482037e5..349dc5203 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn @@ -95,7 +95,7 @@ me: 比你略胜一筹。 <> <> <> -<> +<> //<> === @@ -106,7 +106,7 @@ position: 43,-97 <> <> me: 是了，就是这个记忆。 -<> +<> // me: 佩佩在看天空时，回想起了小时候在病床前的记忆。 me: 佩佩在看海报时，回想起了被主管骂的场景。 <> @@ -169,6 +169,7 @@ title: 退出ClueBoard tags: position: 43,-97 --- +<> <> <> <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn index 5902fde24..fc8749cf4 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn @@ -100,6 +100,7 @@ title: 退出ClueBoard tags: position: 43,-97 --- +<> <> <> // <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn index 168ee1641..b19c6848c 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn @@ -177,6 +177,7 @@ position: 240,-1335 me: Hivemind在上！佩佩的脑里塞满了……这么多记忆打孔带……？ me: 而且，这些打孔带都看起来损坏好严重，应该都用不了了，得先清理一下。 ->清理 + <> <> me: 终于好了……去记忆模块里看看是怎么回事吧。 <> @@ -251,6 +252,7 @@ position: 238,-441 <> ->安装色觉晶圆 <> + <> <> <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 0bfdabe66..eadc8278c 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -657,15 +657,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 91 - m_Sprite: {fileID: -7561048859183053609, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: -2045223472492294054, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 6.43, y: 6.92} + m_Size: {x: 6.4, y: 6.89} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &64733696 @@ -2510,15 +2510,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 84 - m_Sprite: {fileID: 1360595682716938842, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: 2718753242143689634, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 19.23, y: 10.83} + m_Size: {x: 19.2, y: 10.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &136303351 @@ -8051,15 +8051,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 92 - m_Sprite: {fileID: -4842215378010547842, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: 8556100819556451817, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 6.43, y: 6.92} + m_Size: {x: 6.4, y: 6.89} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &359031930 @@ -14963,15 +14963,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 94 - m_Sprite: {fileID: -3142858326716962396, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: -6552264520947253540, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 19.23, y: 2.05} + m_Size: {x: 19.2, y: 10.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &779898515 @@ -14983,7 +14983,7 @@ Transform: m_GameObject: {fileID: 779898512} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: -3.9959, z: 0} + m_LocalPosition: {x: 0, y: -0.08, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -15717,6 +15717,83 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 828.40497, y: 1073.6129} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &851958693 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8653719598885068355, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_Name + value: "\u5927\u8111\u7EF4\u4FEE\u7EC6\u5316\u5BFC\u51FAnew (1)" + objectReference: {fileID: 0} + - target: {fileID: -8211477621981062317, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalPosition.x + value: -53.32 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7552582706839291426, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + 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: 3385720964532856396, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3385720964532856396, guid: fd04c28739017964789d58d573f9fabb, type: 3} + propertyPath: m_LocalPosition.y + value: 5.39 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 4843985084834002234, guid: fd04c28739017964789d58d573f9fabb, type: 3} --- !u!1 &853664052 GameObject: m_ObjectHideFlags: 0 @@ -15867,15 +15944,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 87 - m_Sprite: {fileID: 624897959450107421, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: -927624008850010626, guid: fd04c28739017964789d58d573f9fabb, 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.63, y: 1.52} + m_Size: {x: 1.605, y: 1.49} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &856179977 @@ -17084,7 +17161,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &962974901 Transform: m_ObjectHideFlags: 0 @@ -17649,7 +17726,6 @@ Transform: - {fileID: 136303351} - {fileID: 1255902013} - {fileID: 779898515} - - {fileID: 1945484605} - {fileID: 1689729956} - {fileID: 359031930} - {fileID: 64733696} @@ -22392,15 +22468,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 90 - m_Sprite: {fileID: 3574780706464231606, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: 1431309822762583427, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 19.23, y: 10.83} + m_Size: {x: 19.2, y: 10.8} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1255902013 @@ -23187,15 +23263,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 86 - m_Sprite: {fileID: -8416189507735107685, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: -6543533287616272395, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 0.36, y: 0.1} + m_Size: {x: 13.685, y: 0.075} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1360586353 @@ -23765,7 +23841,7 @@ PlayableDirector: - key: {fileID: -2096467622206487476, guid: 2624f43fbe016a3448d6b3c166e4f3a7, type: 2} value: {fileID: 779898513} - key: {fileID: -2701885683825618972, guid: 2624f43fbe016a3448d6b3c166e4f3a7, type: 2} - value: {fileID: 1945484603} + value: {fileID: 0} - key: {fileID: -8860506575275046772, guid: 2624f43fbe016a3448d6b3c166e4f3a7, type: 2} value: {fileID: 1689729954} - key: {fileID: -1986832442075148380, guid: 2624f43fbe016a3448d6b3c166e4f3a7, type: 2} @@ -25349,7 +25425,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1496285956 Transform: m_ObjectHideFlags: 0 @@ -27622,7 +27698,7 @@ Transform: m_GameObject: {fileID: 1616369505} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.94, y: -0.57, z: 0} + m_LocalPosition: {x: -0.935, y: -0.59, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -27668,7 +27744,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 7 + m_SortingOrder: 9 m_Sprite: {fileID: 3822937466802405960, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -29050,15 +29126,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 93 - m_Sprite: {fileID: -4715977109324954109, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: -2177734637330651117, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 6.43, y: 6.92} + m_Size: {x: 6.4, y: 6.89} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1689729956 @@ -32954,15 +33030,15 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 88 - m_Sprite: {fileID: 1946335975260001102, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Sprite: {fileID: 5409709317053496634, guid: fd04c28739017964789d58d573f9fabb, 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.865, y: 1.045} + m_Size: {x: 1.85, y: 1.02} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1831821124 @@ -34251,112 +34327,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1944658449} m_CullTransparentMesh: 1 ---- !u!1 &1945484602 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1945484605} - - component: {fileID: 1945484604} - - component: {fileID: 1945484603} - m_Layer: 0 - m_Name: "\u9ED1\u8FB9 (2)" - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!95 &1945484603 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1945484602} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 0} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!212 &1945484604 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1945484602} - 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: 0 - m_SortingLayer: 0 - m_SortingOrder: 94 - m_Sprite: {fileID: -3142858326716962396, guid: fd04c28739017964789d58d573f9fabb, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 19.23, y: 2.05} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1945484605 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1945484602} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 4.06, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 997068238} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1953358212 GameObject: m_ObjectHideFlags: 0 @@ -35300,8 +35270,8 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 - m_Sprite: {fileID: 21300000, guid: 8d0695bdcc4385247b6affebb0e03f80, type: 3} + m_SortingOrder: 8 + m_Sprite: {fileID: 21300000, guid: 76a158ff7cdf41045b3cc2d58a7f9218, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -35328,7 +35298,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &2013993327 Transform: m_ObjectHideFlags: 0 @@ -40315,3 +40285,4 @@ SceneRoots: - {fileID: 1648045778} - {fileID: 659675443} - {fileID: 183765382} + - {fileID: 851958693} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 1580f79a2..f82e6d0e4 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -358,7 +358,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &17373562 RectTransform: m_ObjectHideFlags: 0 @@ -654,7 +654,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: f0b03b0b-698b-4610-b820-188f939a7d5b + value: edfac449-8b78-4bd8-83bf-3c2f132b3534 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -1877,6 +1877,10 @@ PrefabInstance: propertyPath: graphManager value: objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: 5148f6f4-fd32-4335-b0f0-82fa5b2fe6a8 + objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager value: @@ -1903,7 +1907,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: c70d1a4b-5660-4887-b33d-8a7ae3e7fbe5 + value: c39f7e27-580c-462d-8158-6542b1087427 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -2081,7 +2085,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u9000\u51FA\u8BCA\u65AD\u9762\u677F" + m_text: "\u70B9\u51FB\u7ED3\u675F\u8BCA\u7597" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} @@ -2090,8 +2094,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4281479730 - m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: @@ -2108,8 +2112,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 24 - m_fontSizeBase: 24 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2579,7 +2583,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: e0899c87-ea4a-4a24-8e8c-a1a54df14409 + value: 5237a001-3cbd-4bf4-a77c-d8f363429155 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -3037,6 +3041,10 @@ PrefabInstance: propertyPath: graphManager value: objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: aba66f02-33fe-4929-ae28-07dee62e498b + objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager value: @@ -3067,7 +3075,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: f0b03b0b-698b-4610-b820-188f939a7d5b + value: 2994959d-6702-440b-94c6-4bba45b5e10e objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -3338,7 +3346,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: b88436fd-7cce-4a4d-b543-d9111b923e87 + value: 33bd4aa6-448d-46ce-ab34-fe1a3448982a objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: node @@ -3374,7 +3382,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 740e79d0-12d1-4d32-bfaf-aefa7cc8f1c2 + value: a2735a6e-82db-40dd-a8a5-b7be50602e92 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -4413,8 +4421,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -73} - m_SizeDelta: {x: 160, y: 30} + m_AnchoredPosition: {x: 0, y: -121} + m_SizeDelta: {x: 300, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &401198731 MonoBehaviour: @@ -4485,7 +4493,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.5377358, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -4801,8 +4809,8 @@ RectTransform: 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: -93.751, y: 67.59995} - m_SizeDelta: {x: 105.8776, y: 104.6536} + m_AnchoredPosition: {x: -5, y: 54} + m_SizeDelta: {x: 250, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &441218358 MonoBehaviour: @@ -5759,6 +5767,10 @@ PrefabInstance: propertyPath: graphManager value: objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: 3bfdc827-84c5-41a3-996b-2e8d6da135aa + objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager value: @@ -5785,7 +5797,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 08cda3f2-0c46-46f9-9686-05d6f58370a1 + value: 543a53d2-8e77-4bf2-bb7e-4be8d0b5b9c5 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -6190,7 +6202,7 @@ PrefabInstance: objectReference: {fileID: 3728315362672514892} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 6b1f6465-974b-4f58-961f-e13a939fa054 + value: 2af592ee-a001-4216-abc3-38e48b42a48f objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager @@ -6214,7 +6226,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 47a9dc83-05c4-4781-9c53-c0e707632647 + value: 6af187df-2c85-4752-b95e-6d57692a95f5 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -6698,14 +6710,14 @@ RectTransform: m_GameObject: {fileID: 520475755} 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_LocalScale: {x: 1.5, y: 1.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2037011635} 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: -18} + m_AnchoredPosition: {x: -0, y: -32} m_SizeDelta: {x: -49.6643, y: -122.1812} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &520475757 @@ -6920,7 +6932,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: f0b03b0b-698b-4610-b820-188f939a7d5b + value: 55c24795-5ff6-486a-880c-5201ff29454f objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -7750,6 +7762,10 @@ PrefabInstance: propertyPath: graphManager value: objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: 45bc8928-4917-425a-ae57-0cdb05fd3601 + objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager value: @@ -7776,7 +7792,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: cd71439e-1b19-4e8e-b865-e8b580c787cd + value: bcf37126-3e32-4b35-af5e-6f6b2feda369 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -8638,7 +8654,7 @@ MonoBehaviour: runMode: 0 firstTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} clinicScene: ClinicScene - testYarnProject: BodyModuleTest + testYarnProject: EyeTest --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -8910,7 +8926,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: b88436fd-7cce-4a4d-b543-d9111b923e87 + value: 134c9c16-7aec-4cfd-bcfa-3ec5c489219e objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: node @@ -8946,7 +8962,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 740e79d0-12d1-4d32-bfaf-aefa7cc8f1c2 + value: 4bb878b0-ddd8-48b1-bc55-2fc0ddb3a3c9 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -10435,7 +10451,6 @@ RectTransform: - {fileID: 977428574} - {fileID: 807333251} - {fileID: 17373562} - - {fileID: 903780132} - {fileID: 693830866} m_Father: {fileID: 2249997785315930564} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -10626,6 +10641,10 @@ PrefabInstance: propertyPath: graphManager value: objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: c242f00d-8454-425e-9e22-14009e6aca78 + objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager value: @@ -10652,7 +10671,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 9857ff85-563f-4bdf-b665-da73ffcb78ff + value: 02a856f4-2f2b-4abd-8b6b-75b541946912 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -11343,7 +11362,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &903780132 RectTransform: m_ObjectHideFlags: 0 @@ -11358,12 +11377,12 @@ RectTransform: m_Children: - {fileID: 435293760} - {fileID: 401198730} - m_Father: {fileID: 847479668} + m_Father: {fileID: 2249997785315930564} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -77} - m_SizeDelta: {x: 300, y: 150} + m_AnchoredPosition: {x: -105, y: 936} + m_SizeDelta: {x: 500, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &903780133 MonoBehaviour: @@ -11495,7 +11514,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &977428574 RectTransform: m_ObjectHideFlags: 0 @@ -12536,7 +12555,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u6309\u4F4F\u95EE\u9898\u4E0B\u65B9\u7684\u4E09\u89D2\u6807\uFF0C\n\u62D6\u5230\u6B63\u786E\u7B54\u6848\u9644\u8FD1\u7684\u5706\u5708\u6807\u8BB0\u4E0A\u3002" + m_text: "\u6309\u4F4F\u95EE\u9898\u4E0B\u65B9\u7684\u4E09\u89D2\u6807\uFF0C\n\u62D6\u5230\u4F60\u8BA4\u4E3A\u6B63\u786E\u7684\u7EBF\u7D22\u4E0A" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} @@ -13636,7 +13655,7 @@ PrefabInstance: objectReference: {fileID: 3728315362672514892} - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 7d96663b-98a2-4835-ac05-0eb8eb8de2ad + value: 9d1a2eff-37d2-4110-bcc8-e9669379e85a objectReference: {fileID: 0} - target: {fileID: 720753418213842348, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: node @@ -13672,7 +13691,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: f0b03b0b-698b-4610-b820-188f939a7d5b + value: 83c54e92-cb3c-40b0-a2de-eda4d514e87f objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -13688,7 +13707,7 @@ PrefabInstance: objectReference: {fileID: 1949785438} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.size - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: ports.Array.data[0] @@ -13744,7 +13763,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8881612702600003380, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_IsActive @@ -13876,7 +13895,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} propertyPath: _sID - value: 6a99c833-becb-4141-a3dc-e21bf34946d6 + value: d894ac63-2f28-4ec9-8b52-d0068c6dda3b objectReference: {fileID: 0} - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} propertyPath: node @@ -14008,7 +14027,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} propertyPath: _sID - value: 970844ab-ea3b-4a49-951e-2f939a86427d + value: 37e038c2-1681-4825-96d2-aea2e9ee6fe5 objectReference: {fileID: 0} - target: {fileID: 6571406705974035353, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} propertyPath: _enableDrag @@ -14577,7 +14596,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 15e3a3bc-239d-4a10-96f6-2e75a20b25de + value: d3e50b93-e3f1-494d-88ad-619335defe28 objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: node @@ -14617,7 +14636,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 6de0feb3-6d76-410b-b4bd-236824de268b + value: 1376d64b-bf06-4936-998d-93046b1d1e62 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -16332,6 +16351,10 @@ PrefabInstance: propertyPath: graphManager value: objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: 0f995302-1b92-4a8f-8d95-d71489444c52 + objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager value: @@ -16358,7 +16381,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: 17eeb671-77e2-498b-b183-e7f142504e4f + value: 0bd6f385-094e-4c01-956a-5768cd6f3926 objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -17949,7 +17972,7 @@ RectTransform: 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: 0.00030517578, y: -18.381851} + m_AnchoredPosition: {x: 0.00030517578, y: -214} m_SizeDelta: {x: 293.38, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1689237973 @@ -17972,7 +17995,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5982\u679C\u6B63\u786E\u7EBF\u6761\u4F1A\u53D8\u6210\u7EFF\u8272\u3002" + m_text: "\u5982\u679C\u6B63\u786E\u7EBF\u6761\u4F1A\u53D8\u6210\u7EA2\u8272\u3002" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} @@ -18035,7 +18058,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: 0, z: 0, w: 27.916138} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -18878,7 +18901,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1774093879 RectTransform: m_ObjectHideFlags: 0 @@ -20502,8 +20525,8 @@ RectTransform: 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: 56.34436, y: 67.6} - m_SizeDelta: {x: 180.6917, y: 104.6536} + m_AnchoredPosition: {x: -5, y: -100} + m_SizeDelta: {x: 256.65, y: 131} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1983360899 MonoBehaviour: @@ -20687,6 +20710,10 @@ PrefabInstance: propertyPath: graphManager value: objectReference: {fileID: 3728315362672514892} + - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + propertyPath: _sID + value: aced908a-47d6-44a2-959a-9e72d3614bed + objectReference: {fileID: 0} - target: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: graphManager value: @@ -20713,7 +20740,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _sID - value: b375f636-33d2-4ffc-8015-abc1616d19a3 + value: d258ea47-c641-4054-bb4c-fc19122d301d objectReference: {fileID: 0} - target: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: _enableDrag @@ -30540,6 +30567,7 @@ RectTransform: - {fileID: 243936684424215245} - {fileID: 5920854427958188614} - {fileID: 3602190427476120800} + - {fileID: 903780132} - {fileID: 847479668} m_Father: {fileID: 3525746627669574815} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -36088,7 +36116,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: -1269.9045, y: 944.4136, z: 0} + position: {x: 941.05255, y: 1173.4302, z: 0} dragSelection: customRenderer: {fileID: 0} line: diff --git a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs index 1483e9173..516f90587 100644 --- a/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs +++ b/Assets/Scripts/FixSystemNew/StateTransition/FixState.cs @@ -110,7 +110,7 @@ namespace AibisDream.FixSystem { var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var eyeSystem = FixSystemCenter.SystemDic.Get(); - + bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Module Pic").GetComponent().sprite=Resources.Load("Art/Fix/Peipei/视觉盖子打开"); // 插头回到初始插孔 bodyModuleSystem.ResetPlug(); // 相机聚焦到目标位 @@ -139,6 +139,7 @@ namespace AibisDream.FixSystem public IEnumerator Execute() { + var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var eyeSystem = FixSystemCenter.SystemDic.Get(); //yield return new WaitForSeconds(Duration/2); yield return MainUIController.Instance.FadeInSync(Duration/2); @@ -152,7 +153,7 @@ namespace AibisDream.FixSystem { yield return null; } - + bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Module Pic").GetComponent().sprite=Resources.Load("Art/Fix/Peipei/视觉盖子关闭"); eyeSystem.OnExit(); }