Merge branch 'develop' into feature/bubble

This commit is contained in:
2025-02-22 01:39:22 +08:00
17 changed files with 344 additions and 58 deletions
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 560a88da2bbc70140bed167f0ba7fe37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: fb01be13d6e88ca488dda82150319bfc
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 117dcc671050f5247bd8743b91ecaab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
@@ -16,18 +16,19 @@ me: (轻哼)小鸟...小鸟……
me: ……
<<hide_dialog>>
<<wait 2>>
->CenterOption: 回到诊室
<<hide_dialog>>
<<wait 1>>
<<fade_out_actor ActorManager "医生" 1>>
<<wait 1>>
<<fade_in 1>>
->CenterOption: 回到诊室
<<hide_dialog>>
<<wait 1>>
<<fade_out_actor ActorManager "医生" 1>>
<<wait 1>>
<<fade_in 1>>
<<NextYarn>>
//你走出诊室,靠在巷子的墙上。
//石头正坐在台阶上,反复播放着他和你共同录制的音乐。
//【把前边关于“我是谁”的对话挪出来】
//吸完最后一口烟,你长舒一口气,转身回到诊室。
<<NextYarn>>
===
@@ -28,8 +28,8 @@ me: ……
// 或许是因为季节的变化,或许是因为别的什么。
peipei: 和我想象的…不太一样。
me: 天要黑了
me: 不过你说得对,这里没什么好看的。
me: 天要黑了,还没想好去哪么
me: 你说得对,这里没什么好看的。
你抽了一口烟。
<<hide_dialog>>
@@ -7,6 +7,7 @@ position: 205,-53
<<hide_dialog>>
<<set_time_of_day EnvironmentManager "Midnight">>
<<set_weather EnvironmentManager "snow">>
<<fade_in_actor ActorManager "佩佩天桥" 0.1>>
<<fade_out 1>>
<<wait 1>>
@@ -82,17 +83,19 @@ peipei: 医生…这片树叶是什么颜色的?
<<hide_dialog>>
<<wait 3>>
<<hide_full_screen>>
<<wait 5>>
me: 你不是要回去工作吗?
<<show_full_screen 6医生脸部特写>>
<<wait 2>>
me: 是...黄色。
<<hide_dialog>>
<<wait 1>>
<<show_full_screen 5佩佩说话特写>>
<<wait 1>>
她忽然回过头看着你,露出了一个久违的笑容。
<<wait 1>>
<<hide_full_screen>>
<<wait 2>>
她伸出手,把树叶交给你。
<<wait 2>>
<<hide_dialog>>
<<wait 1>>
@@ -6,6 +6,7 @@ position: 251,-1150
<<fade_in 1>>
<<switch_fix_system_to BodyModule>>
<<fade_out 1>>
<<clear_tasks TaskManager>>
<<add_task TaskManager "执行视觉-记忆桥截断术">>
//<<task_moveIn TaskManager>>
me: 开始吧…截断视觉-记忆桥。
@@ -10,7 +10,7 @@ position: -545,-709
title: 结束术前谈话2
position: -251,470
position: -268,422
---
<<set $gameStage = "手术">>
<<jump Center>>
@@ -208,6 +208,7 @@ peipei: 太好了!谢谢你!
peipei: 谢谢你,谢谢你……医生!
me: ……
me: 我们去治疗室吧。
<<set $isPeipeiBE=false>>
<<switch_fix_system_to BodyModule>>
<<SetHeat 0>>
@@ -5,13 +5,99 @@ position: 251,-1150
---
<<task_moveOut TaskManager>>
<<switch_fix_system_to Clinic>>
<<jump 结束结束对话>>
<<if $isPeipeiBE==true>>
<<jump BE结束对话>>
<<else>>
<<jump HE结束对话>>
<<endif>>
===
title: BE结束对话
position: 275,-222
---
peipei:我回去工作了,再见
<<character_fade_out_new>>
<<jump BE外出>>
===
title: HE结束对话
position: 275,-222
---
peipei:谢谢你医生
me:打算去哪呢
peipei:还没想好,我出去想想
<<character_fade_out_new>>
<<jump 结束结束对话>>
===
title: 结束结束对话
position: 275,-222
---
<<set $gameStage = "流程结束">>
<<jump Center>>
===
===
title: BE外出
tags:
colorID: 8
position: 205,-53
---
<<hide_dialog>>
<<fade_in 1>>
<<load_scene ClinicOut 1>>
<<set_time_of_day EnvironmentManager "Midnight">>
<<fade_in_actor ActorManager "佩佩" 0.1>>
<<fade_out 1>>
<<wait 1>>
佩佩双手撑在栏杆上,四处好奇地张望着。
me: ……
<<hide_dialog>>
<<fade_in_actor ActorManager "医生" 1>>
//她疲惫的眼神透露出一种陌生的情绪。<br>这里显然已经和她印象中的世界不太一样了。
//或许是因为季节的变化,或许是因为别的什么。
<<hide_dialog>>
<<wait 1>>
->点火
<<hide_dialog>>
<<wait 1>>
me: 呼…
<<hide_dialog>>
<<wait 2>>
// 佩佩走出诊室,你跟在后面。
// 她疲惫地四处张望着。这里显然已经和她印象中的世界不太一样了。
// 或许是因为季节的变化,或许是因为别的什么。
me: 还没有回去么
me: 我该回去了
me: 医生,再见
你抽了一口烟。
me: 再见
<<hide_dialog>>
<<wait 1>>
<<fade_out_actor ActorManager "佩佩" 1>>
<<hide_dialog>>
<<wait 1>>
你目视她离开,吸完最后一口烟,长舒一口气。
<<hide_dialog>>
<<wait 1>>
->回诊室
<<hide_dialog>>
<<fade_out_actor ActorManager "医生" 1>>
<<wait 1>>
<<fade_in 1>>
<<wait 1>>
<<load_scene SubWay 1>>
<<set_time_of_day EnvironmentManager "night">>
<<fade_out 1>>
感谢游玩艾比斯之梦,本次demo的体验流程已结束。
提示:尚有分支可以探索
===
@@ -5,6 +5,7 @@ position: 43,-97
<<fade_in 1>>
<<switch_fix_system_to "BodyModule">>
<<fade_out 1>>
<<clear_tasks TaskManager>>
<<task_moveIn TaskManager>>
<<complete_task TaskManager "深入检查UF模块">>
<<add_task TaskManager "分析病理与治疗方案">>
@@ -29,9 +29,141 @@ tags:
colorID: 8
position: 205,-53
---
占位
<<fade_in 1>>
<<hide_dialog>>
<<load_scene ClinicOut 1>>
<<set_time_of_day EnvironmentManager "Midnight">>
<<set_weather EnvironmentManager "snow">>
<<fade_in_actor ActorManager "佩佩天桥" 0.1>>
<<fade_out 1>>
<<wait 1>>
me: 佩佩?
me: 跑到哪里去了……
<<hide_dialog>>
<<wait 1>>
peipei: 下雪了!
你抬头看去,灰白色的天空中,除了树叶外,还飘落着一种细细的粉末,洒在你的手上。
<<hide_dialog>>
<<wait 1>>
peipei: 你看见了吗?医生!
头顶的天桥栏杆上面探出一个脑袋,佩佩正笑着朝你打招呼。
peipei: 医生!来这里!
->去天桥
<<hide_dialog>>
<<fade_in 1>>
<<wait 1>>
<<load_scene Bridge 1>>
<<fade_in_actor ActorManager "佩佩" 0.1>>
<<fade_out 1>>
<<wait 1>>
<<fade_in_actor ActorManager "医生" 1>>
<<wait 2>>
// 她背对着你喊着你,头也不回地抬头看着天空。
// 你再次摸了摸自己的眼睛。尽管你明白这个结果,但你还没有习惯这种视觉。
me: 你不是要回去工作吗?
佩佩依然没有回头,还是痴痴地抬头到处看,树叶和雪花一同从她的面前飘落,洋洋洒洒。
<<hide_dialog>>
<<wait 1>>
// 你靠着墙坐了下来,掏出烟,点上火,深深吸了一口,吐出白色的烟雾。
<<show_full_screen 2佩佩抬头>>
<<wait 1>>
peipei: 这个城市…好美啊。
<<hide_dialog>>
<<wait 1>>
<<show_full_screen 3环境特写>>
<<wait 2>>
me: 是啊。好美啊。
<<hide_dialog>>
<<wait 2>>
<<show_full_screen 2佩佩抬头>>
<<wait 1>>
树叶从她的面前飘落。
<<wait 1>>
<<show_full_screen 4接树叶>>
<<wait 2>>
她接住了一片,举了起来,仔细端详着。
<<wait 1>>
peipei: 医生…这片树叶是什么颜色的?
<<wait 1>>
<<hide_dialog>>
<<wait 3>>
<<show_full_screen 6医生脸部特写>>
<<wait 2>>
me: 是绿色的
<<hide_dialog>>
<<wait 1>>
<<show_full_screen 5佩佩说话特写>>
<<wait 1>>
她忽然回过头看着你,露出了一个久违的笑容。
<<wait 1>>
<<hide_full_screen>>
<<wait 2>>
她伸出手,把树叶交给你。
<<wait 2>>
<<hide_dialog>>
<<wait 1>>
->接过
<<wait 1.5>>
// 她依然看着你,直直的眼神和你对视。她的嘴微张着,许多种表情从她的脸上闪过。
<<show_full_screen 5佩佩说话特写>>
<<wait 1>>
peipei: 我会有很多机会给你画画的。
// 说完,她再次给了你一个笑容,转身离开。
peipei: 再见,医生。
<<hide_full_screen>>
<<wait 1>>
<<fade_out_actor ActorManager "佩佩" 1>>
<<hide_dialog>>
<<wait 1>>
peipei: 你会有的…
<<hide_dialog>>
<<wait 2>>
->回到诊室
<<fade_out_actor ActorManager "医生" 1>>
//感觉可以把之前写的day1mid改到这里的BE,只是树叶其实是绿的,但你说是黄的
<<fade_in 1>>
<<wait 1>>
<<load_scene SubWay 1>>
<<set_time_of_day EnvironmentManager "night">>
<<fade_out 1>>
感谢游玩艾比斯之梦,本次demo的体验流程已结束。
//<<NextYarn>>
===
@@ -10,8 +10,9 @@ MemModule: 正在执行记忆色彩清除……
MemModule: 正在等待手动处理只读记忆……
<<fade_out 1>>
<<complete_task TaskManager "执行记忆色彩清除术">>
<<task_moveIn TaskManager>>
<<clear_tasks TaskManager>>
<<add_task TaskManager "中断记忆色彩清除">>
<<task_moveIn TaskManager>>
me: 哈哈……
->停止记忆色彩清除进程
Error: 进程被手动中断!正在恢复数据……
@@ -480,7 +480,7 @@ me: 音乐?
<<move_needle 1>>
<<wait 1>>
<<play_loop_audio disc>>
<<play_loop_audio music_shitou_2>>
<<wait 2>>
me: 原来如此,这些奇怪的结构原来是…
+91 -10
View File
@@ -5163,7 +5163,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -3342937662201039715, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: -3170886729776644801, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_IsActive
@@ -5207,7 +5207,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1262858780890837252, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1299721495546471413, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_SortingLayer
@@ -5239,7 +5239,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4298917388974584923, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5392237558087498815, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_SortingLayer
@@ -5267,7 +5267,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7463308599773279362, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7857843955892672629, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
propertyPath: m_SortingLayer
@@ -5299,11 +5299,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 1262858780890837252, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
m_PrefabInstance: {fileID: 105721799}
m_PrefabAsset: {fileID: 0}
--- !u!1 &105721801 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -3342937662201039715, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
m_PrefabInstance: {fileID: 105721799}
m_PrefabAsset: {fileID: 0}
--- !u!1 &105721802 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -8679430258694198479, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
@@ -5378,7 +5373,7 @@ MonoBehaviour:
- {fileID: 105721803}
midnightObjects:
- {fileID: 105721802}
- {fileID: 105721801}
- {fileID: 105721804}
- {fileID: 105721800}
snowEffect: {fileID: 1604901053}
--- !u!4 &115529396
@@ -5395,6 +5390,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 82282814}
- {fileID: 869492463}
- {fileID: 172576939}
- {fileID: 1501389274}
m_Father: {fileID: 0}
@@ -11058,6 +11054,90 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5296327770213497549, guid: 87957cfe30e56984b82c1d9a90fad889, type: 3}
m_PrefabInstance: {fileID: 671080241}
m_PrefabAsset: {fileID: 0}
--- !u!1 &869492462
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 869492463}
- component: {fileID: 869492464}
m_Layer: 0
m_Name: "\u4F69\u4F69\u5929\u6865"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &869492463
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 869492462}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1.595865, y: -0.13008846, z: 0.31335288}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 115529396}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &869492464
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 869492462}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 1905855335
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 4145790568345934211, guid: aaa4b1e0109a1ea4389a36252af080b2, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 17.860466, y: 10.046512}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1001437908
GameObject:
m_ObjectHideFlags: 0
@@ -17859,6 +17939,7 @@ MonoBehaviour:
actors:
- {fileID: 172576940}
- {fileID: 1501389275}
- {fileID: 869492464}
--- !u!1001 &2034462922
PrefabInstance:
m_ObjectHideFlags: 0
+1 -1
View File
@@ -2617,7 +2617,7 @@ MonoBehaviour:
engineConfig:
gearSpeed: 0.05
speedRate: 15
pullCount: 10
pullCount: 14
returnSpeed: 5
isAvailable: 0
isPullActive: 0
+3 -3
View File
@@ -32971,8 +32971,8 @@ Transform:
m_GameObject: {fileID: 1875449743}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0.0072515006, w: -0.9999737}
m_LocalPosition: {x: -6.99, y: -0.44, z: 2.952667}
m_LocalScale: {x: 0.87260586, y: 0.8692812, z: 0.87260586}
m_LocalPosition: {x: -4.81, y: 1.18, z: 2.952667}
m_LocalScale: {x: 0.25641185, y: 0.25543493, z: 0.25641185}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 267394791}
@@ -33018,7 +33018,7 @@ SpriteRenderer:
m_SortingLayerID: 1134468525
m_SortingLayer: 10
m_SortingOrder: 20
m_Sprite: {fileID: 21300000, guid: 6fc7bec4977c83145a699795210bdd65, type: 3}
m_Sprite: {fileID: 21300000, guid: ff00cf2824e9f3741b4c24209d17814c, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_FlipX: 1
m_FlipY: 0
+1 -1
View File
@@ -8254,7 +8254,7 @@ MonoBehaviour:
- {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2}
- {fileID: 11400000, guid: afc5b01ef301cc74db7cae741acad427, type: 2}
- {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
runMode: 1
runMode: 0
firstTalkSo: {fileID: 11400000, guid: ac5ca9a66ff22ab4b9cd5adbdade6b8c, type: 2}
testTalkSo: {fileID: 11400000, guid: 8d8b11f0c2fbc4d4cb8c2857d98383c9, type: 2}
saveFileName: "PeipeiDay1_\u8BB0\u5FC6\u68C0\u67E5"