From e6c2472a3b89e352eecf04fa94145f79c2282566 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Wed, 15 Apr 2026 23:25:13 +0800 Subject: [PATCH] =?UTF-8?q?feat(day2-night):=20=E5=A4=A9=E6=A1=A5=E5=85=A8?= =?UTF-8?q?=E5=B1=8F=E5=9B=BE=E8=B5=84=E6=BA=90=E4=B8=8E=20Yarn=20?= =?UTF-8?q?=E6=BC=94=E5=87=BA=E3=80=81FP=5FDay2=5Fnight=20=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E5=8C=96=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Made-with: Cursor --- .../FP_Day2_night Shared Data.asset | 124 +++++++------- .../Art/Obj/day2夕阳医生看佩佩侧脸.png | 3 + .../Art/Obj/day2夕阳医生看佩佩侧脸.png.meta | 153 ++++++++++++++++++ .../Yarn/FP_Day2_night/FP_Day2_night.yarn | 9 +- 4 files changed, 223 insertions(+), 66 deletions(-) create mode 100644 Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png create mode 100644 Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png.meta diff --git a/Assets/Language/Dialog/FP_Day2_night/FP_Day2_night Shared Data.asset b/Assets/Language/Dialog/FP_Day2_night/FP_Day2_night Shared Data.asset index 30320f5e0..3bd397e66 100644 --- a/Assets/Language/Dialog/FP_Day2_night/FP_Day2_night Shared Data.asset +++ b/Assets/Language/Dialog/FP_Day2_night/FP_Day2_night Shared Data.asset @@ -184,12 +184,12 @@ MonoBehaviour: m_Key: line:01905d9 m_Metadata: m_Items: - - rid: 2772513478469223930 + - rid: 2772513481449800086 - m_Id: 25393046114959360 m_Key: line:06df2f5 m_Metadata: m_Items: - - rid: 2772513478469223931 + - rid: 2772513481449800087 - m_Id: 25393046114959361 m_Key: line:060ff16 m_Metadata: @@ -349,17 +349,17 @@ MonoBehaviour: m_Key: line:06144e9 m_Metadata: m_Items: - - rid: 2772513478469223932 + - rid: 2772513481449800088 - m_Id: 25468682502307840 m_Key: line:0b4ef34 m_Metadata: m_Items: - - rid: 2772513478469223933 + - rid: 2772513481449800089 - m_Id: 25468682502307841 m_Key: line:030c331 m_Metadata: m_Items: - - rid: 2772513478469223934 + - rid: 2772513481449800090 - m_Id: 25468682502307842 m_Key: line:099f942 m_Metadata: @@ -369,42 +369,42 @@ MonoBehaviour: m_Key: line:0ae9ba1 m_Metadata: m_Items: - - rid: 2772513478469223935 + - rid: 2772513481449800091 - m_Id: 25468682502307844 m_Key: line:0c056c9 m_Metadata: m_Items: - - rid: 2772513478469223936 + - rid: 2772513481449800092 - m_Id: 25468682502307845 m_Key: line:0e5016f m_Metadata: m_Items: - - rid: 2772513478469223937 + - rid: 2772513481449800093 - m_Id: 25468682502307846 m_Key: line:0160646 m_Metadata: m_Items: - - rid: 2772513478469223938 + - rid: 2772513481449800094 - m_Id: 25468682502307847 m_Key: line:0fdb846 m_Metadata: m_Items: - - rid: 2772513478469223939 + - rid: 2772513481449800095 - m_Id: 25468682502307848 m_Key: line:05f8057 m_Metadata: m_Items: - - rid: 2772513478469223940 + - rid: 2772513481449800096 - m_Id: 25468682502307849 m_Key: line:02794dd m_Metadata: m_Items: - - rid: 2772513478469223941 + - rid: 2772513481449800097 - m_Id: 25468682502307850 m_Key: line:062dbbc m_Metadata: m_Items: - - rid: 2772513478469223942 + - rid: 2772513481449800098 - m_Id: 25468682502307851 m_Key: line:0f0072c m_Metadata: @@ -414,52 +414,52 @@ MonoBehaviour: m_Key: line:0e84854 m_Metadata: m_Items: - - rid: 2772513478469223943 + - rid: 2772513481449800099 - m_Id: 25468682502307853 m_Key: line:0c6cccf m_Metadata: m_Items: - - rid: 2772513478469223944 + - rid: 2772513481449800100 - m_Id: 25468682502307854 m_Key: line:0ef5bd7 m_Metadata: m_Items: - - rid: 2772513478469223945 + - rid: 2772513481449800101 - m_Id: 25468682502307855 m_Key: line:08565f1 m_Metadata: m_Items: - - rid: 2772513478469223946 + - rid: 2772513481449800102 - m_Id: 25468682502307856 m_Key: line:0529bb5 m_Metadata: m_Items: - - rid: 2772513478469223947 + - rid: 2772513481449800103 - m_Id: 25468682502307857 m_Key: line:0b50578 m_Metadata: m_Items: - - rid: 2772513478469223948 + - rid: 2772513481449800104 - m_Id: 25468682502307858 m_Key: line:018c3cf m_Metadata: m_Items: - - rid: 2772513478469223949 + - rid: 2772513481449800105 - m_Id: 25468682502307859 m_Key: line:01ff340 m_Metadata: m_Items: - - rid: 2772513478469223950 + - rid: 2772513481449800106 - m_Id: 25468682502307860 m_Key: line:05dcfae m_Metadata: m_Items: - - rid: 2772513478469223951 + - rid: 2772513481449800107 - m_Id: 25468682502307861 m_Key: line:0cac326 m_Metadata: m_Items: - - rid: 2772513478469223952 + - rid: 2772513481449800108 - m_Id: 25468682502307862 m_Key: line:0c65de8 m_Metadata: @@ -719,7 +719,7 @@ MonoBehaviour: m_Key: line:086a27b m_Metadata: m_Items: - - rid: 2772513478469223953 + - rid: 2772513481449800109 - m_Id: 117041440633118721 m_Key: line:0dc1a12 m_Metadata: @@ -729,28 +729,28 @@ MonoBehaviour: m_Key: line:095df55 m_Metadata: m_Items: - - rid: 2772513478469223954 + - rid: 2772513481449800110 - m_Id: 122788045084852226 m_Key: line:092421c m_Metadata: m_Items: - - rid: 2772513476521493295 - - rid: 2772513478469223955 + - rid: 2772513481449800081 + - rid: 2772513481449800111 - m_Id: 122795368658403328 m_Key: line:0a36c02 m_Metadata: m_Items: - - rid: 2772513478469223956 + - rid: 2772513481449800112 - m_Id: 122795368729706496 m_Key: line:034968b m_Metadata: m_Items: - - rid: 2772513478469223957 + - rid: 2772513481449800113 - m_Id: 122795368729706497 m_Key: line:01f871e m_Metadata: m_Items: - - rid: 2772513478469223958 + - rid: 2772513481449800114 - m_Id: 123181765441519616 m_Key: line:5c5192f0 m_Metadata: @@ -765,7 +765,7 @@ MonoBehaviour: m_Key: line:08751a2 m_Metadata: m_Items: - - rid: 2772513478469223959 + - rid: 2772513481449800115 m_Metadata: m_Items: [] m_KeyGenerator: @@ -808,158 +808,158 @@ MonoBehaviour: nodeName: ver2 tags: - lastline - - rid: 2772513476521493295 + - rid: 2772513481449800081 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223930 + - rid: 2772513481449800086 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223931 + - rid: 2772513481449800087 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223932 + - rid: 2772513481449800088 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223933 + - rid: 2772513481449800089 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223934 + - rid: 2772513481449800090 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223935 + - rid: 2772513481449800091 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223936 + - rid: 2772513481449800092 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223937 + - rid: 2772513481449800093 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223938 + - rid: 2772513481449800094 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223939 + - rid: 2772513481449800095 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223940 + - rid: 2772513481449800096 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223941 + - rid: 2772513481449800097 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223942 + - rid: 2772513481449800098 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223943 + - rid: 2772513481449800099 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223944 + - rid: 2772513481449800100 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223945 + - rid: 2772513481449800101 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223946 + - rid: 2772513481449800102 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223947 + - rid: 2772513481449800103 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223948 + - rid: 2772513481449800104 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223949 + - rid: 2772513481449800105 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223950 + - rid: 2772513481449800106 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223951 + - rid: 2772513481449800107 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223952 + - rid: 2772513481449800108 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223953 + - rid: 2772513481449800109 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223954 + - rid: 2772513481449800110 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223955 + - rid: 2772513481449800111 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223956 + - rid: 2772513481449800112 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223957 + - rid: 2772513481449800113 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: [] - - rid: 2772513478469223958 + - rid: 2772513481449800114 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 tags: - lastline - - rid: 2772513478469223959 + - rid: 2772513481449800115 type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} data: nodeName: ver2 diff --git a/Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png b/Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png new file mode 100644 index 000000000..0b812b97c --- /dev/null +++ b/Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:215985b255e4edcf6f906c7f2de2fd8775deb5245ebf76c13eb72b3d2ed02614 +size 75512 diff --git a/Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png.meta b/Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png.meta new file mode 100644 index 000000000..4f1ba927c --- /dev/null +++ b/Assets/RawResources/Art/Obj/day2夕阳医生看佩佩侧脸.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 864b23d56f3b18c4ba9f911e94e665cb +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: 0 + 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: 21.5 + 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: 0 + 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/Yarn/FP_Day2_night/FP_Day2_night.yarn b/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn index 7146837a3..29cdd735e 100644 --- a/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn +++ b/Assets/Resources/Yarn/FP_Day2_night/FP_Day2_night.yarn @@ -113,7 +113,7 @@ position: 205,-53 <> [character name="peipei" bubbleIdx=1 /]夕阳的颜色… #line:08751a2 <> - 头顶的天桥栏隐约看到有一个人影。【动画占位】 #line:01f871e + 头顶的天桥栏隐约看到有一个人影。 #line:01f871e ->CenterOption: 去天桥 #line:092421c <> <> @@ -123,16 +123,17 @@ position: 205,-53 <> <> <> + <> <> <> <> -<> 佩佩双手撑在栏杆上，呆呆地望着远方。 #line:01905d9 - +<> +<> +<> <> -<> <> me: …… #line:06df2f5 //她疲惫的眼神透露出一种陌生的情绪。
这里显然已经和她印象中的世界不太一样了。