diff --git a/Assets/Resources/Art/Obj/UF4.png b/Assets/Resources/Art/Obj/UF4.png new file mode 100644 index 000000000..40ac7dca3 --- /dev/null +++ b/Assets/Resources/Art/Obj/UF4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5cce1d2262e9c6e6ea2fd79bc90c8b0e82963fab104d8d69ac524f08e789e5c +size 119084 diff --git a/Assets/Resources/Art/Obj/UF4.png.meta b/Assets/Resources/Art/Obj/UF4.png.meta new file mode 100644 index 000000000..1eb8f4ea0 --- /dev/null +++ b/Assets/Resources/Art/Obj/UF4.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: e2ad23c7ab4958b4ab923c2da2212b80 +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: 100 + 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/Audio/amb_gearbox.ogg b/Assets/Resources/Audio/amb_gearbox.ogg new file mode 100644 index 000000000..9b2488c09 --- /dev/null +++ b/Assets/Resources/Audio/amb_gearbox.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f55494a16e7eb9555236820ade7a8cec051c3c001f0ad2c9c0de3e6dd2d8bc3c +size 313604 diff --git a/Assets/Resources/Audio/amb_gearbox.ogg.meta b/Assets/Resources/Audio/amb_gearbox.ogg.meta new file mode 100644 index 000000000..0b5740505 --- /dev/null +++ b/Assets/Resources/Audio/amb_gearbox.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d2d71ce661aebfb479f7927023c20cfc +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/disc.ogg b/Assets/Resources/Audio/disc.ogg new file mode 100644 index 000000000..7298d09f3 --- /dev/null +++ b/Assets/Resources/Audio/disc.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ca242c03746deac16f8745f15494a31efef5760f3b7ba8c7b4f9b825ae9c095a +size 3441883 diff --git a/Assets/Resources/Audio/disc.ogg.meta b/Assets/Resources/Audio/disc.ogg.meta new file mode 100644 index 000000000..a86ffda09 --- /dev/null +++ b/Assets/Resources/Audio/disc.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0c1e0f78f4ae7984e964c780e8e5a532 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/gearbox_bad.ogg b/Assets/Resources/Audio/gearbox_bad.ogg new file mode 100644 index 000000000..33a01b101 --- /dev/null +++ b/Assets/Resources/Audio/gearbox_bad.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3a170a6099ee540dbb02fb2a6306a53b1f37f80d76cb774b0f98a0e0e380dfa8 +size 328422 diff --git a/Assets/Resources/Audio/gearbox_bad.ogg.meta b/Assets/Resources/Audio/gearbox_bad.ogg.meta new file mode 100644 index 000000000..a47ebf6f3 --- /dev/null +++ b/Assets/Resources/Audio/gearbox_bad.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: edfc3a76c01c21e448735fe6e2a10b96 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Audio/gears_running.ogg b/Assets/Resources/Audio/gears_running.ogg new file mode 100644 index 000000000..d45219623 --- /dev/null +++ b/Assets/Resources/Audio/gears_running.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffa057902f0eeef24de5440b2a6f6649b0470a577c5d619ad253765c2d5b7c2a +size 351888 diff --git a/Assets/Resources/Audio/gears_running.ogg.meta b/Assets/Resources/Audio/gears_running.ogg.meta new file mode 100644 index 000000000..9a1077128 --- /dev/null +++ b/Assets/Resources/Audio/gears_running.ogg.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 4b82bfed42e95dd43ac559d0226cf12c +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Characters/石头.prefab b/Assets/Resources/Characters/石头.prefab index e73905b4d..38fdbe039 100644 --- a/Assets/Resources/Characters/石头.prefab +++ b/Assets/Resources/Characters/石头.prefab @@ -16,7 +16,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &321962101837076397 Transform: m_ObjectHideFlags: 0 @@ -166,7 +166,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &7053611760725568351 Transform: m_ObjectHideFlags: 0 @@ -404,7 +404,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &6255869994967285290 Transform: m_ObjectHideFlags: 0 @@ -824,7 +824,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &557159831907654330 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab b/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab index 60477ebe1..8a26b54e1 100644 --- a/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab +++ b/Assets/Resources/Prefabs/Basic Function/Audio Manager.prefab @@ -800,6 +800,8 @@ Transform: m_Children: - {fileID: 978527555660104375} - {fileID: 9053731432274197797} + - {fileID: 4268419905980150376} + - {fileID: 2029144652665450398} - {fileID: 4517563608897647978} - {fileID: 8704957973411935911} - {fileID: 8958232513318718903} @@ -948,3 +950,259 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &7726957597452757375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4268419905980150376} + - component: {fileID: 3385871051024393721} + m_Layer: 0 + m_Name: Loop3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4268419905980150376 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7726957597452757375} + serializedVersion: 2 + 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: 8180040489590280703} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &3385871051024393721 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7726957597452757375} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 0.659 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &8879056570523940757 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2029144652665450398} + - component: {fileID: 3634632532610254604} + m_Layer: 0 + m_Name: Loop4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2029144652665450398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8879056570523940757} + serializedVersion: 2 + 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: 8180040489590280703} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &3634632532610254604 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8879056570523940757} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 8866379113506573767, guid: b14347481450a234a852407119bfecb4, type: 2} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 0 + m_Volume: 0.659 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn index 2c8ebaaeb..9a2cc03ad 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/ClueBoard.yarn @@ -166,8 +166,13 @@ position: 40,-327 --- <> <> - me: 嗯……这个“锟斤拷烫烫烫”在把记忆的引用扩散到其他模块，导致记忆严重发热…… - me: 它居然不是UF内部的进程…… + me: 嗯……这个“锟斤拷烫烫烫”在不断吸取佩佩的负面记忆 + 电子助手:我看了它的标注，是因为这些“记忆”，对它来说还比较新鲜吧 + 电子助手:无论多么美好的记忆，看的多了，也看不出什么花儿来了 + 电子助手:但是饿了总得吃吧，就得挖掘点儿，更劲爆的 + me: 你怎么说的这么轻描淡写？你知道这会对佩佩造成什么影响么！ + 电子助手:我只是在说事实而已，怎么说来着... + 电子助手:"HiveMind不在乎！” <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 41c9a1d23..62c9ca788 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -27744,7 +27744,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 9 + m_SortingOrder: 5 m_Sprite: {fileID: 3822937466802405960, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -33128,7 +33128,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 6 m_Sprite: {fileID: -8510992098524624651, guid: fd04c28739017964789d58d573f9fabb, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index cd67d39d0..71114e5da 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8222,7 +8222,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: runMode: 1 - firstTalkSo: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} + firstTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} clinicScene: ClinicScene testYarnProject: EyeTest --- !u!4 &719228339 @@ -20506,7 +20506,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: cd23ff026854d10479581b679a516101, type: 3} + m_Sprite: {fileID: 5271063806834724076, guid: 33aa26d5c34c8c343af3a5f0d4e6a9c8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -35302,7 +35302,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: 1206.0001, y: 1186, z: 0} + position: {x: 838.6986, y: 1178.7141, z: 0} dragSelection: customRenderer: {fileID: 0} line: diff --git a/Assets/Scripts/Clue/ClueBaordNew.cs b/Assets/Scripts/Clue/ClueBaordNew.cs index 43c1b93cd..fe42d71bc 100644 --- a/Assets/Scripts/Clue/ClueBaordNew.cs +++ b/Assets/Scripts/Clue/ClueBaordNew.cs @@ -140,6 +140,10 @@ public void NodeInit(string nodeID,bool isactive) [YarnCommand("ClearAllNode")] public void ClearAllNode() { + foreach(Connection line in gm.localConnections) + { + line.Remove(); + } foreach(GameObject node in nodeLists) { node.SetActive(false); diff --git a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs index 81c6604cb..8b9f3a51d 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/CharacterViewer.cs @@ -19,6 +19,7 @@ namespace AibisDream.FixSystem public IEnumerator CharacterInit(string characterName) { + // 异步加载角色预制体（psb） ResourceRequest request = Resources.LoadAsync($"Characters/{characterName}"); yield return request; @@ -39,7 +40,6 @@ namespace AibisDream.FixSystem // 加载新的 GameObject characterPrefab = request.asset as GameObject; _curCharacter = Instantiate(characterPrefab, transform); - // 初始化处理 _curCharacter.SetActive(false); _blinkLayer = _curCharacter.transform.Find("闭眼").GetComponent(); @@ -61,7 +61,7 @@ namespace AibisDream.FixSystem private static void ActiveLayer(Transform root, string layerName = null) { - var childLayers = root.GetComponentsInChildren(); + var childLayers = root.GetComponentsInChildren(true); if (childLayers.Length == 0) return; foreach (var layer in childLayers) @@ -79,7 +79,7 @@ namespace AibisDream.FixSystem private void SetCharacterAlpha(float alpha) { _characterAlpha = alpha; - SpriteRenderer[] renderers = _curCharacter.GetComponentsInChildren(); + SpriteRenderer[] renderers = _curCharacter.GetComponentsInChildren(true); foreach (var childRenderer in renderers) { Color color = childRenderer.color; diff --git a/Assets/Scripts/Framework/AudioKit/AudioManager.cs b/Assets/Scripts/Framework/AudioKit/AudioManager.cs index 79c72e3eb..2624309c2 100644 --- a/Assets/Scripts/Framework/AudioKit/AudioManager.cs +++ b/Assets/Scripts/Framework/AudioKit/AudioManager.cs @@ -9,6 +9,7 @@ namespace AibisDream { private const string LoopSource = "Loop"; private const string LoopSource2 = "Loop2"; + private const string LoopSource3 = "Loop3"; private const string InteractionSource = "Interaction"; private const string VoiceSource = "Voice"; private const string MemorySource = "Memery"; @@ -17,6 +18,7 @@ namespace AibisDream private AudioSource _loopSource; private AudioSource _loopSource2; + private AudioSource _loopSource3; private AudioSource _interactionSource; private AudioSource _voiceSource; private AudioSource _memorySource; @@ -29,6 +31,7 @@ namespace AibisDream { _loopSource = transform.Find(LoopSource).GetComponent(); _loopSource2 = transform.Find(LoopSource2).GetComponent(); + _loopSource3 = transform.Find(LoopSource3).GetComponent(); _interactionSource = transform.Find(InteractionSource).GetComponent(); _voiceSource = transform.Find(VoiceSource).GetComponent(); _memorySource = transform.Find(MemorySource).GetComponent(); @@ -138,6 +141,26 @@ namespace AibisDream Instance._loopSource2.Pause(); } + [YarnCommand("play_loop3_audio")] + public static void PlayLoop3Audio(string audioName) + { + AudioClip clip = Resources.Load($"Audio/{audioName}"); + if (clip == null) + { + clip = Instance.RandomLoadAudioClip(3, $"Audio/{audioName}"); + } + + Instance._loopSource3.clip = clip; + Instance._loopSource3.Play(); + } + + [YarnCommand("pause_loop3_audio")] + public static void PauseLoop3Audio() + { + Instance._loopSource3.Pause(); + } + + public void ContinueLoopAudio() { _loopSource.UnPause(); diff --git a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs index 1eb7331af..9fdc60e95 100644 --- a/Assets/Scripts/Framework/OtherKit/MonoCenter.cs +++ b/Assets/Scripts/Framework/OtherKit/MonoCenter.cs @@ -49,6 +49,14 @@ namespace AibisDream.Framework { if (Input.GetKeyDown(KeyCode.K)) { + Debug.Log(1); + ClinicYarnCommand.CharacterInit("石头"); + } + + if (Input.GetKeyDown(KeyCode.A)) + { + ClinicYarnCommand.CharacterFadeIn(); + ClinicYarnCommand.CharacterFace("正常微微笑"); } } } diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index 65236c2ef..ba0b37b6f 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -103,6 +103,14 @@ namespace AibisDream public void CheckGearSystemState() { + if (_isTargetReached) + { + AudioManager.PlayLoop3Audio("gears_running"); + } + else + { + AudioManager.PauseLoop3Audio(); + } DialogController.Instance.StartDialogNode("齿轮系统状态变化"); } @@ -128,6 +136,7 @@ namespace AibisDream public IEnumerator OpenCover() { + AudioManager.PlayLoop2Audio("amb_gearbox"); // 旋转拉杆 yield return _coverStick.DORotate(new Vector3(0, 0, -90), 1.5f).WaitForCompletion(); // 开盖 @@ -139,6 +148,8 @@ namespace AibisDream public IEnumerator CloseCover() { + AudioManager.PauseLoopAudio(); + AudioManager.PauseLoop2Audio(); // 关盖 var sq = DOTween.Sequence(); sq.Join(_cover.transform.DOLocalMove(coverDownPos, 1.5f)); diff --git a/Assets/Scripts/MiniGame/Gear/Shaft.cs b/Assets/Scripts/MiniGame/Gear/Shaft.cs index 811471531..e67a2d4a2 100644 --- a/Assets/Scripts/MiniGame/Gear/Shaft.cs +++ b/Assets/Scripts/MiniGame/Gear/Shaft.cs @@ -1,5 +1,6 @@ using System; using AibisDream.Framework; +using AibisDream.Utility; using DG.Tweening; using Newtonsoft.Json; using UnityEngine; @@ -91,6 +92,7 @@ namespace AibisDream childGear = gear; gear.transform.parent = transform; _gearSystem.ChangeGraphVertex(GetInstanceID()); + // 面板里的齿轮才能触发 if (transform.parent.name == "Shafts") { @@ -101,6 +103,12 @@ namespace AibisDream private void OnGearPlugIn() { + // 插入音效 + if (!CommonUtil.IsZero(speed) && IsBroken) + { + AudioManager.PlayLoopAudio("gearbox_bad"); + } + // 破损齿轮插进来就发一次事件，交给yarn处理 if (IsBroken) { @@ -115,6 +123,11 @@ namespace AibisDream public void PlugOutGear() { + if (IsBroken) + { + AudioManager.PauseLoopAudio(); + } + // 拔出时齿轮停转 childGear.UpdateRotation(0, _speedScale);