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/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);