From e44600fd649e3baa903190e40406448ad54603c5 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Tue, 31 Dec 2024 03:55:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Art/Background/机娘.jpg | 3 + Assets/Resources/Art/Background/机娘.jpg.meta | 153 ++++++++++++++++++ .../Art/{Obj => Background}/盲盒.jpg | 0 .../Art/{Obj => Background}/盲盒.jpg.meta | 0 Assets/Resources/Art/Obj/机娘.jpg.meta | 2 +- .../Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn | 1 + .../Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn | 35 ++-- .../Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn | 1 + .../Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn | 2 +- Assets/Scripts/SystemWindow/WindowManager.cs | 2 +- 10 files changed, 178 insertions(+), 21 deletions(-) create mode 100644 Assets/Resources/Art/Background/机娘.jpg create mode 100644 Assets/Resources/Art/Background/机娘.jpg.meta rename Assets/Resources/Art/{Obj => Background}/盲盒.jpg (100%) rename Assets/Resources/Art/{Obj => Background}/盲盒.jpg.meta (100%) diff --git a/Assets/Resources/Art/Background/机娘.jpg b/Assets/Resources/Art/Background/机娘.jpg new file mode 100644 index 000000000..15a4ac44a --- /dev/null +++ b/Assets/Resources/Art/Background/机娘.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7fb97914147d3a7ae2568f1452f69d51df9c34fe9c295c8dfbc55b426a5db657 +size 170059 diff --git a/Assets/Resources/Art/Background/机娘.jpg.meta b/Assets/Resources/Art/Background/机娘.jpg.meta new file mode 100644 index 000000000..383d60b0d --- /dev/null +++ b/Assets/Resources/Art/Background/机娘.jpg.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 5b6f717ce43bd4f43a381dedd5daeefa +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: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Art/Obj/盲盒.jpg b/Assets/Resources/Art/Background/盲盒.jpg similarity index 100% rename from Assets/Resources/Art/Obj/盲盒.jpg rename to Assets/Resources/Art/Background/盲盒.jpg diff --git a/Assets/Resources/Art/Obj/盲盒.jpg.meta b/Assets/Resources/Art/Background/盲盒.jpg.meta similarity index 100% rename from Assets/Resources/Art/Obj/盲盒.jpg.meta rename to Assets/Resources/Art/Background/盲盒.jpg.meta diff --git a/Assets/Resources/Art/Obj/机娘.jpg.meta b/Assets/Resources/Art/Obj/机娘.jpg.meta index 383d60b0d..6784db129 100644 --- a/Assets/Resources/Art/Obj/机娘.jpg.meta +++ b/Assets/Resources/Art/Obj/机娘.jpg.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5b6f717ce43bd4f43a381dedd5daeefa +guid: df8b6bd683bd217428f65e2489387f2c TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn index 4f68a8b44..52446e241 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn @@ -3,6 +3,7 @@ tags: position: -9,21 --- <> +<> === title: IntoEyeView tags: 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 683ccc7b0..c349b1421 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn @@ -97,34 +97,30 @@ position: 249,-1464 me: 今天的病人来得有点晚呀 me: 看一会电视吧。 -<> -<> +<> +<> 播报员: 机体们，早上好！现在是电视购物环节，我们的商品将以电子形象的形式送到大家的账号中。 -<> +<> 播报员: 这个电子盲盒里可以开出各种电子人物！像是“印第安卓·琼斯”、“铁臂阿童木”、“蝴蝶夫人”…… 播报员: 电视机前的观众朋友，你想选哪一个呢？ ->左边 ->右边 ->你好，直接给我限定款 -<> 播报员: 恭喜！限定款！本月最热门的电子形象！“兔女郎邦尼”！ -<> -<> +<> me: 呃……我宁愿来一只货真价实的兔兔。 - ？？？: 请问…… <> <> //这里希望做铺垫，之前石头进门会有*吱呀*声 me: 欸，你是怎么进来的？一般都会有一声*吱呀*的开门声。 - peipei: 啊，对不起医生，我不知道要把门推响才能进门的。我现在出去，请您别介意。 <> 门: *吱呀* me: 咳咳，兔兔..不是..病人，请进来吧。 <> me: 你好，你是来看病的吗？ -<> +<> peipei: 嗯嗯……佩佩……公司美术部来的…… me: 好的，请稍等，我查看一下你的患者信息。 <> @@ -194,7 +190,7 @@ me: 佩佩，我刚刚在数据库里查到了你与这张图有关，这个形 <> <> <> -<> +<> <> peipei: 最早是我画的……但是……领导换人画了…… peipei: 画的时候，我和uf的沟通也出现了问题，拖了很久…… @@ -241,9 +237,10 @@ peipei: 嗯！我画过。 <> <> me: 呃……确实是不太对劲…… +<> me: 你的描述，不管有关无关，它全画出来了…… me: 好像还有一些疑点—— -<> +<> ->她为什么会哭呢？ me: 情绪会影响到uf的运作吗，需要排查。 ->为什么画面像镜子一样裂开了呢？ @@ -393,8 +390,9 @@ position: -273,-535 <> <> + <> + <> <> - <> me: 佩佩，你的色觉晶圆缺失，让你看不到颜色，你知道的。 me: 但是你居然可以用特殊的方法，用记忆中的色彩来弥补视觉的不足。 me: 正是在这个过程中，一些记忆被UF错误地引用了。 @@ -402,7 +400,7 @@ position: -273,-535 peipei: 原来如此。 me: 所以，我需要给你执行*视觉-记忆桥切手术*，切断视觉与记忆中间的这条子路。 me: 但它的代价是……以后你可能都没办法再用那种特殊的能力看到色彩了，你能接受吗，佩佩？ - <> + <> <> peipei: 哎……医生，你知道游戏作弊码吗？ me: 小时候倒是玩过。 @@ -415,7 +413,7 @@ position: -273,-535 me: 如果你无时无刻不在回忆过去的色彩，那么UF就会把这一切都记录下来，刻录在画面之中。 peipei: 原来如此。 me: 所以，我需要给你执行*视觉-记忆桥切手术*，切断视觉与记忆中间的这条子路。 - <> + <> <> peipei: 哎……医生，你知道游戏作弊码吗？ me: 小时候倒是玩过。 @@ -428,7 +426,7 @@ me: 如果你同意，请在手术单上签个字吧。 <> <> <> -<> +<> <> === @@ -492,6 +490,7 @@ position: 239,-506 --- me: 检查应该都完成了…我们出去吧，佩佩。 <> +<> <> <> <> @@ -502,16 +501,16 @@ me: 检查应该都完成了…我们出去吧，佩佩。 // <> me: 佩佩，你可以再把一开始那张图画一遍吗？ peipei: OK -<> +<> <> <> <> <> <> <> -<> +<> peipei: 它看起来没问题！太好了！ -<> +<> <> <> peipei: 医生，多亏了有你我才可以继续工作，继续画画！ 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 71b54c387..173571843 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn @@ -106,6 +106,7 @@ position: 239,-1813 <> <> <> +<> <> <> <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn index 87acba15b..32c458a2e 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/UF.yarn @@ -5,7 +5,7 @@ group:UFConsole position: 2898,-2205 --- <> -<> +<> <> <> diff --git a/Assets/Scripts/SystemWindow/WindowManager.cs b/Assets/Scripts/SystemWindow/WindowManager.cs index 20f09384f..6ae903750 100644 --- a/Assets/Scripts/SystemWindow/WindowManager.cs +++ b/Assets/Scripts/SystemWindow/WindowManager.cs @@ -68,7 +68,7 @@ public class WindowManager : MonoBehaviour [YarnCommand("OpenProgressWindow")] public IEnumerator OpenProgressWindow(string title, string description, float duration) { - AudioManager.PlayMemoryAudio("ui"); + AudioManager.PlayInteraction("ui"); progressWindowPrefab.TitleValue = title; progressWindowPrefab.DescriptionValue = description; float currentProgress = 0;