Merge branch 'feature/DAY1_text_update' into 'develop'

Feature/day1 text update See merge request aibis-dream/aibis-dream!414
2025-06-09 10:04:10 +00:00
parent e22d9baff7 997dcd4f4c
commit 666e94ed43
8 changed files with 63 additions and 18 deletions
@@ -0,0 +1,16 @@
+{
+    "files.exclude": {
+        ".history": true,
+        "**/.history": true,
+        "/.history": true
+    },
+    "files.watcherExclude": {
+        "**/.history": true
+    },
+    "search.exclude": {
+        "**/.history": true
+    },
+    "explorer.autoRevealExclude": {
+        "**/.history": true
+    }
+}
@@ -228,7 +228,6 @@ yl: 很好。回到你的岗位上吧。 #line:071456c
 你没再说什么，头也不回地进入了诊室。 #line:05a6408 

 //感觉应该在这里给玩家控制和英理对话的走向，是争吵还是妥协，影响她对你的判断
->>>>>>> Stashed changes
 <<NextYarn>>

 ===
@@ -1,9 +1,18 @@
 title: Start
 tags: 
 colorID: 8
-<<<<<<< Updated upstream
-position: 205,-53
-=======
+position: 250,200
+---
+<<fade_out>>
+<<jump 佩佩>>
+===
+
+
+
+
+title: 火山
+tags: 
+colorID: 8
 position: 250,200
 ---
 <<hide_dialog>>
@@ -13,7 +22,7 @@ position: 250,200
 <<hide_dialog>>
 <<wait 1>>
 <<play_actor_animation ActorManager 医生 PlaySmoke>>
-me: 呼… #line:0f8a4c3 
+me: 呼… 
 <<hide_dialog>>
 <<wait 2>>

@@ -118,7 +127,6 @@ title: 佩佩
 tags: 
 colorID: 8
 position: 250,200
->>>>>>> Stashed changes
 ---
 <<hide_dialog>>
 <<set_time_of_day EnvironmentManager "day">>
@@ -225,7 +233,33 @@ peipei: 再见了，叶子。 #line:0694ade
 佩佩看了你一眼，微笑了一下，转头离开了。 #line:00d0440 
 <<fade_out_actor ActorManager "佩佩" 1>>
 <<wait 1>>
-吸完最后一口烟，你长舒一口气。 #line:0a732a9 
+<<play_sfx "event:/Scriptal/pager">>
+<<wait 1.5>>
+【我低头看BB机】
+
+me: “我：喂，在么”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-忙着呢”
+<<wait 1>>
+me: “我：你知道“待改进观察期”是什么吗”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-见鬼，你也被英理找了？”
+<<wait 0.5>>
+me: “我：“也”？”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-说来话长…晚上聊吧”
+<<wait 1>>
+me: “我：老地方？”
+<<wait 1>>
+<<play_sfx "event:/Scriptal/pager_short">>
+me: “火山：-老地方。”
+<<wait 1>>
+【我收起BB机】
+<<hide_dialog>>
+<<wait 1>>
 <<stop_music music>>
 ->CenterOption: 回到诊室 #line:05dd25e 
    <<hide_dialog>>
@@ -31,9 +31,6 @@ position: 205,-53
    <<wait 1>>
    <<NextYarn>>

-<<<<<<< Updated upstream
-=======
-
 <<hide_dialog>>
 //火山正像他说的那样，坐在你们常去的那个卡座。卡座的调酒机体正微笑着听他说话。 #line:07db420 
 //hs: （拍打柜台）路斯！这边！ #line:0b48254 
@@ -149,5 +146,4 @@ me: 姐姐？

 <<hide_dialog>>
 <<NextYarn>>
->>>>>>> Stashed changes
 ===
@@ -129,7 +129,7 @@ position: 907,-2702
 <<switch_fix_system_to "BodyModule" "Head">>
 me:体征已经重新稳定。 #line:0b1dd52 
 ???: 我<waitfor=0.1>这是<waitfor=0.1>什么？<waitfor=0.1>我<waitfor=0.1>不应该<waitfor=0.1>还<waitfor=0.1>活着。
-???: <shake>我<waitfor=0.1>必须<waitfor=0.2>{size\}死{#size\}，回收<waitfor=0.1>必须<waitfor=0.1>被<waitfor=0.1>完成…</shake> #line:0ab8d02 
+???: <shake>我<waitfor=0.1>必须<waitfor=0.2>\{size\}死\{\#size\}，回收<waitfor=0.1>必须<waitfor=0.1>被<waitfor=0.1>完成…</shake> #line:0ab8d02 
 <<set_light_state warning>>
 ???: <shake>必须<waitfor=0.1>完成……<waitfor=0.3><rainb>excλute_core₭₭</rainb><waitfor=0.1>呃…<waitfor=0.1>啊……</shake> #line:083eaa8 
 me:幻象转移了，<waitfor=0.2>现在<waitfor=0.1>重新定位目标。 #line:015afd3