Merge branch 'feature/czq_0610' into 'develop'

开头（双关）音频上传

See merge request aibis-dream/aibis-dream!444

Assets/AddressableAssetsData/AssetGroups/Art Resources.asset

@@ -62,21 +62,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ca909870d485bde44b1e652490df203f
-    m_Address: "BubbleSprite/\u5927\u5BF9\u8BDD\u6846"
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: ff88cbe0521ac8942915f87ca58c5a06
     m_Address: "Mobile/\u8DEF\u4EBA\u5C0F"
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: ccf21927b7ddd1648b8133d790ef636e
-    m_Address: "Clinic/\u4E3B\u573A\u666F"
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
   m_ReadOnly: 0
   m_Settings: {fileID: 11400000, guid: 77169ce22e430f64fb36c771815a4a7b, type: 2}
   m_SchemaSet:

Assets/Language/Dialog/FP_Prologue/FP_Prologue_zh-Hans.asset

@@ -135,7 +135,7 @@ MonoBehaviour:
     m_Metadata:
       m_Items: []
   - m_Id: 76867964956
-    m_Localized: "me: <shake>[[size]]\u5E26\u6211\u56DE\u5BB6\u554A\uFF0C\u59D0\u59D0\u3002[[^size]]</shake>"
+    m_Localized: "me: <shake>\u5E26\u6211\u56DE\u5BB6\u554A\uFF0C\u59D0\u59D0\u3002</shake>"
     m_Metadata:
       m_Items: []
   - m_Id: 76867964957

Assets/Render/Renderer2Dtest.asset

@@ -477,19 +477,15 @@ MonoBehaviour:
     m_PostInfinity: 2
     m_RotationOrder: 4
   _filter:
-  - 0.0048309183
-  - 0.016401261
-  - 0.04532712
-  - 0.08293076
-  - 0.12053438
-  - 0.14946026
-  - 0.1610306
-  - 0.14946026
-  - 0.12053438
-  - 0.08293076
-  - 0.04532712
-  - 0.016401261
-  - 0.0048309183
+  - 0.007228916
+  - 0.043749984
+  - 0.12409639
+  - 0.20444278
+  - 0.24096388
+  - 0.20444278
+  - 0.12409639
+  - 0.043749984
+  - 0.007228916
 --- !u!114 &-6101378415725230565
 MonoBehaviour:
   m_ObjectHideFlags: 3

Assets/Resources/Yarn/FP_Prologue/Stage1_开灯.yarn

@@ -32,8 +32,8 @@ jj?: 好了，<waitfor=0.2>现在你<waitfor=0.2>可以睁开眼睛了。 #line:
 
 // 【画面逐渐变得清晰】
 <<set_global_param prologueDreamStage 1>>
-<<dream_fade_in 2 0.4>>
-<<wait 2>>
+<<dream_fade_in 2 1.3>>
+<<wait 1.5>>
 
 我不敢看得太清楚，<waitfor=0.2>否则会被逻辑模块突然唤醒。 #line:08eb9ab 
 
@@ -128,7 +128,7 @@ me: [[size]]姐<waitfor=0.4>姐<waitfor=0.4>！[[^size]] #line:0f0e96d
 <<hide_dialog>>
 <<wait 2>>
 
-me: <shake>[[size]]带我回家啊，姐姐。[[^size]]</shake>  #line:0d447f7 
+me: <shake>带我回家啊，姐姐。</shake>  #line:0d447f7 
 
 <<hide_dialog>>
 <<wait 3>>
@@ -149,7 +149,6 @@ me: <shake>[[size]]带我回家啊，姐姐。[[^size]]</shake>  #line:0d447f7
 <<hide_dialog>>
 <<wait 1>>
 <<set_global_param prologueDreamStage 4>>
-<<wait 1.6>>
 
 <<jump 开场>>
 
@@ -178,10 +177,15 @@ position: 250,200
 //【顶部居中白字】太 迟 了 …
 //考虑直接开始，不做这段↑↑↑
 
+
 <<hide_dialog>>
+<<play_sfx "event:/Scriptal/prologue_beforeSurgery">>
 <<fade_in 1>>
+<<wait 5>>
+<<play_sfx "event:/Amb/amb">>
+<<set_global_param scene 5>>
 <<switch_fix_system_to Op>>
-<<wait 2>>
+<<wait 0.7>>
 ???: 医生… #line:03c692e 
 me: 体征已经稳定，开始手术。 #line:04d5033 
 <<jump 开盖>>
@@ -192,7 +196,9 @@ tags:
 colorID: 8
 position: 250,200
 ---
-// <<wait 0.5>>
+
+<<play_sfx "event:/Scriptal/head_open">>
+<<wait 0.5>>
 <<Open_play_timeline_no_wait "Art/TimeLineAsset/Open Panel Timeline">>
 <<fade_out 1.8>>
 // <<set $gameStage = 2>>