diff --git a/Assets/RawResources/Art/梦境素材/梦境图片/D2S.meta b/Assets/RawResources/Art/梦境素材/梦境图片/D2S.meta deleted file mode 100644 index ad832ceb1..000000000 --- a/Assets/RawResources/Art/梦境素材/梦境图片/D2S.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 46a75965fd79d134a9991940bff15c67 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/RawResources/Art/梦境素材/梦境图片/D2S枯树-Large.png b/Assets/RawResources/Art/梦境素材/梦境图片/D2S枯树-Large.png new file mode 100644 index 000000000..61d8afc9d --- /dev/null +++ b/Assets/RawResources/Art/梦境素材/梦境图片/D2S枯树-Large.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:79842a597dab33488d547e4d2880d3af9a4b95eb9f918dffbaa5a86b54e4d661 +size 42661 diff --git a/Assets/RawResources/Art/梦境素材/梦境图片/D2S枯树-Large.png.meta b/Assets/RawResources/Art/梦境素材/梦境图片/D2S枯树-Large.png.meta new file mode 100644 index 000000000..a23518f36 --- /dev/null +++ b/Assets/RawResources/Art/梦境素材/梦境图片/D2S枯树-Large.png.meta @@ -0,0 +1,153 @@ +fileFormatVersion: 2 +guid: 59b07b44134af0f4996049e466943131 +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: 40 + 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: 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 + - 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: 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 + 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/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn b/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn index 22b207b93..bb12b1d38 100644 --- a/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn +++ b/Assets/Yarn/FP/FP_Day1_sleep/FP_Day1_sleep.yarn @@ -345,7 +345,7 @@ title: 女孩_已完成 position: 743,-1403 tags: detour --- -girl: 女孩一边哼歌一边继续涂画着,
没有听到你的声音。
#line:01ef1ed +//girl: 女孩一边哼歌一边继续涂画着,
没有听到你的声音。
#line:01ef1ed === title: 天台 @@ -426,10 +426,10 @@ tags: detour 你站在教学楼的楼顶,视野开阔。
空气中似乎有种熟悉的
令人昏昏沉沉的气味……
#line:0325825 <> <> -    boy: 看呀,快看! -    男孩兴奋地抬头看着天空,嘴巴痴痴地张着,没有要走的意思。 -    me: 不去天文台了吗? -    boy: 你去吧!那是你该去的地方。 + boy: 看呀,快看! + 男孩兴奋地抬头看着天空,嘴巴痴痴地张着,没有要走的意思。 + me: 不去天文台了吗? + boy: 你去吧!那是你该去的地方。 <> <> 你站在教学楼的楼顶,视野开阔。
天蓝蓝的,风也有点儿冷了。
你感觉好像有人在喊你。
#line:0f4be5a diff --git a/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn b/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn index b28d95e58..39f6c4532 100644 --- a/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn +++ b/Assets/Yarn/FP/FP_Day2_begin/FP_Day2_begin.yarn @@ -15,6 +15,9 @@ position: 250,-26 <> <> +<> + +me: …… me: 这家伙…… #line:075df29 me: 今天又迟到了么。 #line:09a568c diff --git a/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn b/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn index 22bcea865..673c8860b 100644 --- a/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn +++ b/Assets/Yarn/FP/FP_Day2_night/FP_Day2_night.yarn @@ -43,7 +43,7 @@ position: 205,-53 <> <> <> - <> + <> <> <> <> @@ -51,13 +51,14 @@ position: 205,-53 <> <> + +佩佩双手撑在栏杆上,呆呆地望着远方。 #line:01905d9 +<> +<> + <> <> -佩佩双手撑在栏杆上,呆呆地望着远方。 #line:01905d9 -<> -<> -<> <> <> me: …… #line:06df2f5 diff --git a/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn b/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn index a6ce1d0a2..adf54fc58 100644 --- a/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn +++ b/Assets/Yarn/FP/FP_Day2_sleep/FP_Day2_sleep.yarn @@ -745,10 +745,10 @@ girl: 但是你连我——也不要了吗——! <> 轻飘飘地... #line:0a6d6a5 -<> +<> <> -<> +<> <> girl: 不管发生了什么——! <> @@ -767,7 +767,7 @@ girl: 不管发生了什么——! <> -<> +<> 【关门的声音】 #line:01c4bb5 <> 你深吸一口气,猛地睁开了眼睛。 #line:0734efc @@ -785,7 +785,7 @@ color: purple cluster: Day2_Door position: -4,927 --- -<> +<> 洁白的空气延伸到视线的尽头,正中间是一棵早已枯萎的老树,一动不动。一张淡红色的什么东西在树下静静地躺着。 #line:076531b 如果看过风筝应该把门也画出来<> #line:0293d5e ->门<> #line:04ff66a diff --git a/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn b/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn index 1e6b2010b..f79d164a1 100644 --- a/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn +++ b/Assets/Yarn/FP/FP_Huoshan1/Stage1.yarn @@ -32,7 +32,7 @@ hs: 医——生——救——我——! #line:0184078 //火山气喘吁吁地出现在接诊台。很痛苦的样子。 #line:0256125 -me: 火山? #auto_next #line:01da98b +me: 火山?… #line:01da98b hs: 医生!我…我…我遇到…麻烦了! #line:0e2f50b hs: 我的头-我的头-我的头…… #line:0066c90 @@ -57,14 +57,16 @@ me: ……什么…东西? #line:0924ddd <> +<> + hs: 人类有句古话: *实实* 捂着 为俊杰! #line:0c205b9 -me: 这它妈谁想的词儿? #line:08c4dc3 +me: 这它码谁想的词儿? #line:08c4dc3 hs: 现在购买,可以享受…… #line:037fcdb me: 停——停… #line:04dd0b5 -me: 你来你老朋友这儿一惊一乍的,就为了再坑它买你一顶帽子? #line:0a86bba +me: 你来你老朋友这儿一惊一乍的,
就为了再坑它买你一顶帽子? #line:0a86bba <> <> @@ -72,9 +74,10 @@ me: 你来你老朋友这儿一惊一乍的,就为了再坑它买你一顶帽 // 火山委屈状 #line:0393572 //<> -hs: 嗨,医生你这是什么话。在你眼里我是那么缺德的机体嘛。我太伤心了。 #line:0957ffb +hs: 嗨,医生你这是什么话。
在你眼里我是那么缺德的机体嘛。我太伤心了。 #line:0957ffb <> -hs: 我只是想让你开心一点嘛。毕竟我也知道…你睡不好已经很长时间了。 #line:03d5f78 +<> +hs: 我只是想让你开心一点嘛。毕竟我也知道…
你睡不好已经很长时间了。 #line:03d5f78 <> @@ -92,17 +95,18 @@ hs: 我一眼就看出,你睡不好是因为头有问题。 #line:030f5f6 me: 头? #line:01bb9ad hs: 你那是末端传感器坏死导致的头憋大了。 #line:05929a0 <> +<> hs: 但今天我要恭喜你。我为你带来了这版限定版多功能大头弱化器,有效在视觉上解决头太大的问题。 #line:05c5927 -me: 只能是视觉上么?…不对,我头也不大啊。 #line:01dbe17 +me: 只能是视觉上么?…
不对,我头也不大啊。 #line:01dbe17 hs: 那还是没买这款多功能大头弱化器帽子的问题。 #line:0505062 hs: 只要你头顶戴帽儿了,烦恼就进套儿了,聪明的智商就又能上号儿了。 #line:04500c3 -me: 这从哪抄的词?? #line:0a13852 +me: 这又是从哪抄的词?? #line:0a13852 me: 好了好了…我还要工作呢,你就别折腾我了。 #line:0bb2b87 -me: 求求了,放过我吧。托你的福,我的衣柜里现在帽子比衣服还多。 #line:0bb2b88 -me: 实在要帮忙的话…可以下班再来。 #line:0557914 +me: 求求了,放过我吧。
托你的福,我的衣柜里现在帽子比衣服还多。 #line:0bb2b88 +me: 实在要我帮忙的话…可以下班再来。 #line:0557914 // 火山突然安静下来 //<>