From b7c18858156eabbb29e15598765308521d60057c Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Sat, 1 Mar 2025 02:36:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Art/Icon/Peipeiicon.png | 3 + Assets/Resources/Art/Icon/Peipeiicon.png.meta | 153 ++++++++++++++++++ .../字魂像素积木体(商用需授权) SDF.asset | 4 +- .../Yarn/FP_Peipei1/Stage8_复查.yarn | 3 + .../Yarn/FP_Peipei3/Stage5_看画.yarn | 6 - Assets/Scenes/Persistence.unity | 4 +- ProjectSettings/ProjectSettings.asset | 13 +- 7 files changed, 173 insertions(+), 13 deletions(-) create mode 100644 Assets/Resources/Art/Icon/Peipeiicon.png create mode 100644 Assets/Resources/Art/Icon/Peipeiicon.png.meta diff --git a/Assets/Resources/Art/Icon/Peipeiicon.png b/Assets/Resources/Art/Icon/Peipeiicon.png new file mode 100644 index 000000000..e21291a24 --- /dev/null +++ b/Assets/Resources/Art/Icon/Peipeiicon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8f8de00d0bf16276ed9d5523767bc761d5a0f2eba47091a8fb2cc8c4da52dad +size 1173632 diff --git a/Assets/Resources/Art/Icon/Peipeiicon.png.meta b/Assets/Resources/Art/Icon/Peipeiicon.png.meta new file mode 100644 index 000000000..0fb499cfc --- /dev/null +++ b/Assets/Resources/Art/Icon/Peipeiicon.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: b939a31a2f1b6524982f857bf92bf218 +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/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset b/Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset index 14c813b8a..efdd87309 100644 --- a/Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/字魂像素积木体(商用需授权) SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b4f992d96793008dbbba2228fbaafd5caf6cb651d4aa006aa67391c48b25c8f2 -size 2112034 +oid sha256:b4ff1c6b2edeceada38ca6f8a26ce93add4c0a34cf13e2be2c93fe407dfb876a +size 2116801 diff --git a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn index 478171447..89c908309 100644 --- a/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn +++ b/Assets/Resources/Yarn/FP_Peipei1/Stage8_复查.yarn @@ -130,6 +130,9 @@ position: 435,-3043 ->结束 <> <> +=== + + title: Eye_skyAfterSurgery tags: colorID: 8 diff --git a/Assets/Resources/Yarn/FP_Peipei3/Stage5_看画.yarn b/Assets/Resources/Yarn/FP_Peipei3/Stage5_看画.yarn index c169a97d1..5b30dad40 100644 --- a/Assets/Resources/Yarn/FP_Peipei3/Stage5_看画.yarn +++ b/Assets/Resources/Yarn/FP_Peipei3/Stage5_看画.yarn @@ -24,17 +24,11 @@ me: … <> 旁白: 一张脸透过纸张看着你。这张画非常传神，你能从她的眼神中读出一种压抑着焦虑的坚定。 旁白:那是…
你的脸。
你的眼睛。 -<> -<> <> 最下面有一行小字…… <> peipei: 重获色彩后我第一个看见的是:> <> -<> -<> -<> -<> me: ... me: ...... me: ............ diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index ee965d429..f9f31ac9c 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -9284,10 +9284,10 @@ MonoBehaviour: - {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2} - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - {fileID: 11400000, guid: e749fe0f9aa32f44097e037f52a5bfe0, type: 2} - runMode: 0 + runMode: 2 firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2} testTalkSo: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - saveFileName: "PeipeiDay2_\u624B\u672F\u8272\u5F69\u6062\u590D" + saveFileName: "PeipeiDay1_UF\u68C0\u67E5" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 4cfb5ab80..aea1b8045 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,8 +12,8 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: DefaultCompany - productName: AIBIS Dream + companyName: Tin Bird + productName: Love&RobotRepair defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} @@ -275,7 +275,14 @@ PlayerSettings: AndroidMinifyDebug: 0 AndroidValidateAppBundleSize: 1 AndroidAppBundleSizeToValidate: 150 - m_BuildTargetIcons: [] + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: b939a31a2f1b6524982f857bf92bf218, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: - m_BuildTarget: Android m_Icons: