diff --git a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶16.ogg b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶16.ogg index fdba206b..992b6b28 100644 Binary files a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶16.ogg and b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶16.ogg differ diff --git a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶17.ogg b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶17.ogg index aa9fc333..5b9182df 100644 Binary files a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶17.ogg and b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_小小蝶17.ogg differ diff --git a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁10.ogg b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁10.ogg index 672777ac..ab259043 100644 Binary files a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁10.ogg and b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁10.ogg differ diff --git a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁11.ogg b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁11.ogg index bf3d0894..51c41585 100644 Binary files a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁11.ogg and b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁11.ogg differ diff --git a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁7.ogg b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁7.ogg index a4a9de35..8708a55b 100644 Binary files a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁7.ogg and b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁7.ogg differ diff --git a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁8.ogg b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁8.ogg index 0f9a96c6..9bfabc23 100644 Binary files a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁8.ogg and b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁8.ogg differ diff --git a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁9.ogg b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁9.ogg index 287dce4f..72939c15 100644 Binary files a/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁9.ogg and b/asset/audio/peiyin/c03/c03_三楼窗户人影偷听_陆仁9.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏1.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏1.ogg index 667be389..920cc93f 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏1.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏1.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏2.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏2.ogg index 8064751b..f2ddad77 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏2.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏2.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏3.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏3.ogg index 62bd0fdc..4681377b 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏3.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏3.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏4.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏4.ogg index 58ed7d84..ff2d824f 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏4.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏4.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏5.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏5.ogg index 57a1ff72..122d0877 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏5.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏5.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏6.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏6.ogg index 991214d5..4681d11a 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏6.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_李氏6.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子1.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子1.ogg index 80272861..2c3f1014 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子1.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子1.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子2.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子2.ogg index 920dacba..c4221b28 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子2.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子2.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子3.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子3.ogg index a8a9c458..ecc0ff20 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子3.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子3.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子4.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子4.ogg index 228dbdfb..6f1f171a 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子4.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_癞子4.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子5.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子5.ogg index 8439fb02..10464e64 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子5.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子5.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子6.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子6.ogg index ccf7e884..964ab68d 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子6.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子6.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子7.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子7.ogg index 17a0444e..063a8cd7 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子7.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子7.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子8.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子8.ogg index 7a1be7e2..ca80e57a 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子8.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子8.ogg differ diff --git a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子9.ogg b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子9.ogg index 2105dd4d..7b577311 100644 Binary files a/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子9.ogg and b/asset/audio/peiyin/c03/c03_囚室通风管道偷听_瞎子9.ogg differ diff --git a/asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11_vx.ogg b/asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11_vx.ogg new file mode 100644 index 00000000..af2eb562 Binary files /dev/null and b/asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11_vx.ogg differ diff --git a/asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11_vx.ogg.import b/asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11_vx.ogg.import new file mode 100644 index 00000000..f795650c --- /dev/null +++ b/asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11_vx.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bgatdgiio876u" +path="res://.godot/imported/c03_绞肉机演出_小小蝶11_vx.ogg-cd46178888ddb50f74b4f54c92269e62.oggvorbisstr" + +[deps] + +source_file="res://asset/audio/peiyin/c03/c03_绞肉机演出_小小蝶11_vx.ogg" +dest_files=["res://.godot/imported/c03_绞肉机演出_小小蝶11_vx.ogg-cd46178888ddb50f74b4f54c92269e62.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶11.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶11.ogg index 420f15a6..6714243b 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶11.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶11.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶12.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶12.ogg index a5fd06b1..010d5528 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶12.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶12.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶13.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶13.ogg index 2cfc2d15..62d7190e 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶13.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶13.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶14.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶14.ogg index 1a21cb37..639698b1 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶14.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶14.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶15.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶15.ogg index 5d521b8c..0cff77be 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶15.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_小小蝶15.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁1.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁1.ogg index 70192d15..1a5b3eb3 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁1.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁1.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁2.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁2.ogg index 26dcda1b..3c55336a 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁2.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁2.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁3.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁3.ogg index 70d60bc4..27440074 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁3.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁3.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁4.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁4.ogg index ec2821c5..29c4b818 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁4.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁4.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁5.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁5.ogg index e150d652..6a054801 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁5.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁5.ogg differ diff --git a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁6.ogg b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁6.ogg index 56a9a415..eb7ed720 100644 Binary files a/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁6.ogg and b/asset/audio/peiyin/c03/c03_肉铺内偷听_陆仁6.ogg differ diff --git a/asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg b/asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg new file mode 100644 index 00000000..803c0a8c Binary files /dev/null and b/asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg differ diff --git a/asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg.import b/asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg.import new file mode 100644 index 00000000..3585748d --- /dev/null +++ b/asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://wlxm47uvgdh" +path="res://.godot/imported/sfx_小蝶惊醒喘气_伴随特效.ogg-67c3a39c153f6bfbb6a2c1f1f2cd13f6.oggvorbisstr" + +[deps] + +source_file="res://asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg" +dest_files=["res://.godot/imported/sfx_小蝶惊醒喘气_伴随特效.ogg-67c3a39c153f6bfbb6a2c1f1f2cd13f6.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/asset/dialogue/c03.csv b/asset/dialogue/c03.csv index 7d9ec3be..e8914f36 100644 --- a/asset/dialogue/c03.csv +++ b/asset/dialogue/c03.csv @@ -1,5 +1,4 @@ keys,zh_CN,zh_SH,_character,_notes,_tags -c03_绞肉机演出_小蝉10,下次再见啦！,,小小蝶,,[#anonymous] c03_三楼窗户人影偷听_陆仁7,咱们的诊金也该涨涨了。,咱们看毛病的铜钱是不是要涨一涨了。,陆仁,,[#anonymous] c03_三楼窗户人影偷听_陆仁8,外头的东西今天一个价，明天又是一个价，处处都要花钱，小蝶也到了要上学的年纪...,现在外头的东西一天一个价，哪一样事情覅用铜钱？小蝶也到了要读书的年纪...,陆仁,,[#anonymous] c03_三楼窗户人影偷听_陆仁9,我是个俗人，得为将来打算。,我们平头老百姓，总为以后打算的。,陆仁,,[#anonymous] @@ -157,7 +156,7 @@ c03_绞肉机演出_小小蝶10,那个，这是我新认识的好朋友，她叫 c03_绞肉机演出_小蝉7,我叫方小蝉。,我叫方小蝉。,方小蝉,, c03_绞肉机演出_小蝉8,阿姨，你们是不是要回去吃饭啦，我爸爸...一会也要来喊我回家了。,阿姨，你们是伐是要回起吃饭啦，我爸爸...等些阿要叫我回起了。,方小蝉,, c03_绞肉机演出_小蝉9,再、再见。,再、再见。,方小蝉,, -c03_绞肉机演出_小小蝶11,下次再见啦！,,小小蝶,,[#anonymous] +c03_绞肉机演出_小小蝶11_vx,下次再见啦！,,小小蝶,,[#anonymous] c03_结尾井边演出_小蝉10,我要是还活着...就能拉你起来了,我要是还活来嘿，就好拉侬起来了,方小蝉,, c03_结尾井边演出_小蝶1,方小蝉？我好像...想起你是谁了...,方小蝉？我好像想起侬是啥宁了,吕萍,, c03_结尾井边演出_小蝉11,嗯...那你可以...离开这里了吗？,嗯...那侬可以...回去了伐？,方小蝉,, diff --git a/asset/dialogue/c03.dialogue b/asset/dialogue/c03.dialogue index 41244da3..127c3cdd 100644 --- a/asset/dialogue/c03.dialogue +++ b/asset/dialogue/c03.dialogue @@ -278,7 +278,7 @@ ~ c03_绞肉机回忆小蝶和小婵8 #（混响效果+重叠播放）（衔接记忆回到现实） -小小蝶: 下次再见啦！[#anonymous][ID:c03_绞肉机演出_小小蝶11] +小小蝶: 下次再见啦！[#anonymous][ID:c03_绞肉机演出_小小蝶11_vx] => END ~ c03_井边回忆 diff --git a/scene/entity/ux/swing_2d.gd b/scene/entity/ux/swing_2d.gd index 3d970ccf..4ba0984b 100644 --- a/scene/entity/ux/swing_2d.gd +++ b/scene/entity/ux/swing_2d.gd @@ -5,7 +5,7 @@ extends Marker2D @export var target: Node2D var player: MainPlayer -var distance_to_target: float +var distance_to_target := 0.0 var _angular_velocity := 0.0 var _rotation := 0.0 @@ -15,10 +15,12 @@ func _ready() -> void: player = SceneManager.get_player() if player and target: distance_to_target = global_position.distance_to(target.global_position) + # 刷新一帧 + _physics_process(0.01) func _physics_process(delta: float) -> void: - if not distance_to_target: + if distance_to_target <= 0.0: return var x_distance = abs(global_position.x - player.global_position.x) # gravity diff --git a/scene/ground/scene/c02/s03_院子.tscn b/scene/ground/scene/c02/s03_院子.tscn index 18f7566c..abfd5ead 100644 --- a/scene/ground/scene/c02/s03_院子.tscn +++ b/scene/ground/scene/c02/s03_院子.tscn @@ -81,7 +81,7 @@ [ext_resource type="Texture2D" uid="uid://bjdy0o0qngukl" path="res://asset/art/scene/c03/s00_院子与其他/e_运尸车.png" id="74_f5g0l"] [ext_resource type="Script" uid="uid://b5to0url3t7h4" path="res://scene/ground/script/c02/s03_event李氏给药完成.gd" id="75_0ek7o"] [ext_resource type="SpriteFrames" uid="uid://cmvr3lbwe3h7p" path="res://asset/art/gif/c03_特写与游戏动画/c03_特写与游戏动画_frames.tres" id="75_allmh"] -[ext_resource type="AudioStream" uid="uid://wbpxhy1q0pi5" path="res://asset/audio/sfx/交互/角色/小蝶惊醒喘气.ogg" id="77_0kbwx"] +[ext_resource type="AudioStream" uid="uid://wlxm47uvgdh" path="res://asset/audio/sfx/交互/角色/sfx_小蝶惊醒喘气_伴随特效.ogg" id="77_0kbwx"] [ext_resource type="Texture2D" uid="uid://rsk3dkai37hu" path="res://asset/art/scene/c02/s03_公寓一楼院子/诡异效果/前侧楼梯_楼梯人群_前景.png" id="77_6y26q"] [ext_resource type="Script" uid="uid://3umabu63j1t5" path="res://scene/ground/script/c02/s03_event第三章开幕.gd" id="77_ndc6g"] [ext_resource type="Texture2D" uid="uid://by7ibwt45ndlm" path="res://asset/art/scene/c03/s00_第三章开幕/第三章开场.png" id="77_pyl5w"] @@ -1460,6 +1460,7 @@ metadata/_custom_type_script = "uid://rq6w1vuhuq1m" [node name="Sfx惊醒喘气" type="AudioStreamPlayer" parent="Ground/DeployLayer/Event2D第二章结束井边演出"] stream = ExtResource("77_0kbwx") +volume_db = -5.0 bus = &"game_sfx" script = ExtResource("4_ygnci") metadata/_custom_type_script = "uid://rq6w1vuhuq1m" diff --git a/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd b/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd index 0728180c..63c4246a 100644 --- a/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd +++ b/scene/ground/script/c02/s03_event_2d第二章结束井边演出.gd @@ -34,9 +34,10 @@ func _start_well_show() -> void: # c02_吕萍_背靠呼吸 player.player_action(20, false) # 多坐一会 - await Util.wait(5.5) + await Util.wait(3.0) # 惊醒喘气 $"Sfx惊醒喘气".play() + await Util.wait(2.5) # c02_吕萍_背靠起身 await player.player_action(19, true) await Util.wait(2.0) diff --git a/scene/ground/script/c03/s07_event胖子游戏结束演出.gd b/scene/ground/script/c03/s07_event胖子游戏结束演出.gd index adc213ab..9e6ba100 100644 --- a/scene/ground/script/c03/s07_event胖子游戏结束演出.gd +++ b/scene/ground/script/c03/s07_event胖子游戏结束演出.gd @@ -38,19 +38,17 @@ func _fatty_game_finished_show() -> void: # 小孩笑声 var sfx_laugh = $"Sfx2D小蝉笑声" var tween = create_tween() - tween.tween_interval(3.0) - tween.tween_callback(sfx_laugh.play) - tween.tween_interval(0.5) + tween.tween_interval(2.0) + tween.tween_property(camera, "force_offset:x", -300.0, 3.0).as_relative() + Util.timer(4.0, camera.tween_zoom.bind(1.1, 2.0)) + Util.timer(4.5, sfx_laugh.play) await tween.finished - create_tween().tween_property(camera, "force_offset:x", -300.0, 4.0).as_relative() - await Util.wait(1.5) - camera.tween_zoom(1.2, 3.0) - await Util.wait(2.0) + await Util.wait(0.5) monster.play("地下呼吸帧_准备走路") # 切肉声消失 create_tween().tween_property(sfx_monster, "volume_db", -100.0, 1.0) create_tween().tween_property(sfx_laugh, "position:x", -500.0, 3.0).as_relative() - await Util.wait(3.0) + await Util.wait(2.0) var ambush_xchan = $"../Ambush小蝉消失" as Ambush2D ambush_xchan.visible = true ambush_xchan.modulate.a = 0.0 @@ -58,6 +56,7 @@ func _fatty_game_finished_show() -> void: func(): create_tween().tween_property(ambush_xchan, "modulate:a", 0.0, 1.0) ) create_tween().tween_property(ambush_xchan, "modulate:a", 1.0, 1.0) + await Util.wait(1.0) camera.tween_zoom(1.0, 3.0) create_tween().tween_property(camera, "force_offset:x", 0.0, 3.0) create_tween().tween_property(light, "energy", 0.0, 2.0) diff --git a/scene/ground/script/c03/二章结尾回忆.gd b/scene/ground/script/c03/二章结尾回忆.gd index 5cdee1f5..799a843a 100644 --- a/scene/ground/script/c03/二章结尾回忆.gd +++ b/scene/ground/script/c03/二章结尾回忆.gd @@ -68,17 +68,17 @@ func start_show() -> void: xdie.play("小蝶看向灰姑呼吸") DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_绞肉机回忆小蝶和小婵7") await DialogueManager.dialogue_ended - await Util.wait(0.8) - # 下次见，混响转场 - DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_绞肉机回忆小蝶和小婵8") - await Util.wait(0.8) + await Util.wait(0.5) + # 覆盖转场效果 + SceneManager.white_transition(1.5, 3.0) # c03_meat_grinder: 0:初始化 1:已装转盘 2:胖子游戏结束 3:绞肉机演出 4:演出结束 EventManager.set_stage("c03_meat_grinder", 4) EventManager.set_stage("c03_well_show", 1) - # 覆盖转场效果 - SceneManager.white_transition(1.5, 2.0) - await Util.wait(1.5) EventManager.set_stage_if_greater("handnote_c03_xchan", 1) + await Util.wait(0.5) + # 下次见，混响转场 + DialogueManager.show_dialogue_balloon(GlobalConfig.DIALOG_C03, "c03_绞肉机回忆小蝶和小婵8") + await Util.wait(2.0) # 李氏癞子房间离井边演出比较近，所以选择 5 号门 SceneManager.get_ground_loader().transition_to_scene("c02_s03", "5", 0.5, Color.WHITE)