diff --git a/asset/art/scene/c03/s07_屠宰间/人肉1.png b/asset/art/scene/c03/s07_屠宰间/人肉1.png new file mode 100644 index 00000000..1da82677 Binary files /dev/null and b/asset/art/scene/c03/s07_屠宰间/人肉1.png differ diff --git a/asset/art/scene/c03/s07_屠宰间/人肉1.png.import b/asset/art/scene/c03/s07_屠宰间/人肉1.png.import new file mode 100644 index 00000000..a00ffd8a --- /dev/null +++ b/asset/art/scene/c03/s07_屠宰间/人肉1.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://b05hg1dwbs8k1" +path="res://.godot/imported/人肉1.png-89e50862f294948765cff1ba28825f0e.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s07_屠宰间/人肉1.png" +dest_files=["res://.godot/imported/人肉1.png-89e50862f294948765cff1ba28825f0e.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/scene/c03/s07_屠宰间/人肉2.png b/asset/art/scene/c03/s07_屠宰间/人肉2.png new file mode 100644 index 00000000..742187ec Binary files /dev/null and b/asset/art/scene/c03/s07_屠宰间/人肉2.png differ diff --git a/asset/art/scene/c03/s07_屠宰间/人肉2.png.import b/asset/art/scene/c03/s07_屠宰间/人肉2.png.import new file mode 100644 index 00000000..7dc44fc3 --- /dev/null +++ b/asset/art/scene/c03/s07_屠宰间/人肉2.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://difggiemg2swn" +path="res://.godot/imported/人肉2.png-dc89617f5992a2fbacc69d59996d42e6.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s07_屠宰间/人肉2.png" +dest_files=["res://.godot/imported/人肉2.png-dc89617f5992a2fbacc69d59996d42e6.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/scene/c03/s07_屠宰间/人肉3.png b/asset/art/scene/c03/s07_屠宰间/人肉3.png new file mode 100644 index 00000000..053af302 Binary files /dev/null and b/asset/art/scene/c03/s07_屠宰间/人肉3.png differ diff --git a/asset/art/scene/c03/s07_屠宰间/人肉3.png.import b/asset/art/scene/c03/s07_屠宰间/人肉3.png.import new file mode 100644 index 00000000..e180f67b --- /dev/null +++ b/asset/art/scene/c03/s07_屠宰间/人肉3.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://v4icuu7bhjwb" +path="res://.godot/imported/人肉3.png-edca84847e4ac742ce1fc31d85f90614.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s07_屠宰间/人肉3.png" +dest_files=["res://.godot/imported/人肉3.png-edca84847e4ac742ce1fc31d85f90614.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/asset/art/scene/c03/s07_屠宰间/人肉.png b/asset/art/scene/c03/s07_屠宰间/人肉_合并.png similarity index 100% rename from asset/art/scene/c03/s07_屠宰间/人肉.png rename to asset/art/scene/c03/s07_屠宰间/人肉_合并.png diff --git a/asset/art/scene/c03/s07_屠宰间/人肉_合并.png.import b/asset/art/scene/c03/s07_屠宰间/人肉_合并.png.import new file mode 100644 index 00000000..4f4b9829 --- /dev/null +++ b/asset/art/scene/c03/s07_屠宰间/人肉_合并.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://yrqrap7ksvsv" +path="res://.godot/imported/人肉_合并.png-6c191d95e6775e5222894044c5d266b0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://asset/art/scene/c03/s07_屠宰间/人肉_合并.png" +dest_files=["res://.godot/imported/人肉_合并.png-6c191d95e6775e5222894044c5d266b0.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/scene/entity/ux/swing_2d.gd b/scene/entity/ux/swing_2d.gd new file mode 100644 index 00000000..f056f569 --- /dev/null +++ b/scene/entity/ux/swing_2d.gd @@ -0,0 +1,4 @@ +class_name Swing2D +extends Marker2D + +@export var focus_node: CanvasItem \ No newline at end of file diff --git a/scene/entity/ux/swing_2d.gd.uid b/scene/entity/ux/swing_2d.gd.uid new file mode 100644 index 00000000..b6620051 --- /dev/null +++ b/scene/entity/ux/swing_2d.gd.uid @@ -0,0 +1 @@ +uid://bngxf1rrcqxri diff --git a/scene/ground/scene/c03/s01_三楼.tscn b/scene/ground/scene/c03/s01_三楼.tscn index f04fa365..280adb04 100644 --- a/scene/ground/scene/c03/s01_三楼.tscn +++ b/scene/ground/scene/c03/s01_三楼.tscn @@ -284,6 +284,7 @@ points = PackedVector2Array(30, 151, 723, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.8 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s02_瞎子新卧室.tscn b/scene/ground/scene/c03/s02_瞎子新卧室.tscn index 3094ffb6..a81b00d0 100644 --- a/scene/ground/scene/c03/s02_瞎子新卧室.tscn +++ b/scene/ground/scene/c03/s02_瞎子新卧室.tscn @@ -162,6 +162,7 @@ points = PackedVector2Array(17, 150, 509, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.8 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s03_瞎子理发店.tscn b/scene/ground/scene/c03/s03_瞎子理发店.tscn index 38343ee0..66b2b376 100644 --- a/scene/ground/scene/c03/s03_瞎子理发店.tscn +++ b/scene/ground/scene/c03/s03_瞎子理发店.tscn @@ -103,6 +103,7 @@ points = PackedVector2Array(35, 151, 541, 151) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.85 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s04_李癞房间.tscn b/scene/ground/scene/c03/s04_李癞房间.tscn index ad446101..2d5d6427 100644 --- a/scene/ground/scene/c03/s04_李癞房间.tscn +++ b/scene/ground/scene/c03/s04_李癞房间.tscn @@ -83,6 +83,7 @@ points = PackedVector2Array(26, 150, 471, 149) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.8 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s05_肉铺.tscn b/scene/ground/scene/c03/s05_肉铺.tscn index 2e3bc48e..96230fdd 100644 --- a/scene/ground/scene/c03/s05_肉铺.tscn +++ b/scene/ground/scene/c03/s05_肉铺.tscn @@ -62,6 +62,7 @@ points = PackedVector2Array(26, 150, 513, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.7 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s06_胖子卧室.tscn b/scene/ground/scene/c03/s06_胖子卧室.tscn index ac55acfb..de16a63b 100644 --- a/scene/ground/scene/c03/s06_胖子卧室.tscn +++ b/scene/ground/scene/c03/s06_胖子卧室.tscn @@ -62,6 +62,7 @@ points = PackedVector2Array(26, 150, 481, 149) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.8 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s07_屠宰间.tscn b/scene/ground/scene/c03/s07_屠宰间.tscn index 5ac68f28..5b456375 100644 --- a/scene/ground/scene/c03/s07_屠宰间.tscn +++ b/scene/ground/scene/c03/s07_屠宰间.tscn @@ -1,15 +1,16 @@ -[gd_scene load_steps=12 format=3 uid="uid://c67732f2we13j"] +[gd_scene load_steps=13 format=3 uid="uid://c67732f2we13j"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_oxs1j"] [ext_resource type="Script" path="res://scene/ground/scene/c03/s07_屠宰间.gd" id="2_oxs1j"] [ext_resource type="Script" uid="uid://cpejxlfni6n52" path="res://manager/audio_manager/vibe_sfx.gd" id="3_vyti6"] [ext_resource type="Texture2D" uid="uid://dv4jkirkqgb50" path="res://asset/art/scene/c03/s07_屠宰间/bg_屠宰间背景.png" id="4_oxs1j"] [ext_resource type="Texture2D" uid="uid://btdwnxrmipv4h" path="res://asset/art/scene/c03/s07_屠宰间/fg_屠宰间前景.png" id="5_0gnm3"] -[ext_resource type="Texture2D" uid="uid://cqwimk24aywdh" path="res://asset/art/scene/c03/s07_屠宰间/人肉.png" id="5_ptg0d"] +[ext_resource type="Texture2D" uid="uid://b05hg1dwbs8k1" path="res://asset/art/scene/c03/s07_屠宰间/人肉1.png" id="5_abvxk"] [ext_resource type="Script" uid="uid://dt8cfnm2og4h" path="res://scene/entity/general_sprite2d.gd" id="5_vyti6"] -[ext_resource type="Texture2D" uid="uid://bt3es1i4oep7a" path="res://asset/art/scene/c03/s07_屠宰间/和谐版/和谐版.png" id="7_koxkd"] -[ext_resource type="Texture2D" uid="uid://bffbhg8dlyu35" path="res://asset/art/scene/c03/s07_屠宰间/右边人体.png" id="8_abvxk"] -[ext_resource type="Texture2D" uid="uid://djbkksndyi6g2" path="res://asset/art/scene/c03/s07_屠宰间/和谐版/大猪皮.png" id="9_dly68"] +[ext_resource type="Texture2D" uid="uid://difggiemg2swn" path="res://asset/art/scene/c03/s07_屠宰间/人肉2.png" id="7_abvxk"] +[ext_resource type="Script" uid="uid://bngxf1rrcqxri" path="res://scene/entity/ux/swing_2d.gd" id="7_dly68"] +[ext_resource type="Texture2D" uid="uid://cjau5qsqql2qu" path="res://asset/art/scene/c03/s07_屠宰间/和谐版/和谐版ren.png" id="8_dly68"] +[ext_resource type="Texture2D" uid="uid://v4icuu7bhjwb" path="res://asset/art/scene/c03/s07_屠宰间/人肉3.png" id="9_jfgnj"] [sub_resource type="AnimationLibrary" id="AnimationLibrary_k01ve"] @@ -46,20 +47,32 @@ position = Vector2(873, 15) [node name="悬挂物" type="Node2D" parent="Ground/DeployLayer" index="2"] -[node name="GeneralSprite2D" type="Sprite2D" parent="Ground/DeployLayer/悬挂物"] -position = Vector2(201, -26) -texture = ExtResource("5_ptg0d") +[node name="人" type="Node2D" parent="Ground/DeployLayer/悬挂物"] +position = Vector2(-64, -2) + +[node name="人1" type="Sprite2D" parent="Ground/DeployLayer/悬挂物/人"] +position = Vector2(155, -25) +texture = ExtResource("5_abvxk") script = ExtResource("5_vyti6") -original_texture = ExtResource("5_ptg0d") -safe_texture = ExtResource("7_koxkd") +original_texture = ExtResource("5_abvxk") metadata/_custom_type_script = "uid://dt8cfnm2og4h" -[node name="GeneralSprite2D2" type="Sprite2D" parent="Ground/DeployLayer/悬挂物"] -position = Vector2(325, -25) -texture = ExtResource("8_abvxk") +[node name="Swing2D" type="Marker2D" parent="Ground/DeployLayer/悬挂物/人/人1"] +script = ExtResource("7_dly68") + +[node name="人2" type="Sprite2D" parent="Ground/DeployLayer/悬挂物/人"] +position = Vector2(188, -25) +texture = ExtResource("7_abvxk") script = ExtResource("5_vyti6") -original_texture = ExtResource("8_abvxk") -safe_texture = ExtResource("9_dly68") +original_texture = ExtResource("7_abvxk") +safe_texture = ExtResource("8_dly68") +metadata/_custom_type_script = "uid://dt8cfnm2og4h" + +[node name="人3" type="Sprite2D" parent="Ground/DeployLayer/悬挂物/人"] +position = Vector2(220, -24) +texture = ExtResource("9_jfgnj") +script = ExtResource("5_vyti6") +original_texture = ExtResource("9_jfgnj") metadata/_custom_type_script = "uid://dt8cfnm2og4h" [node name="MainPlayer" parent="Ground" index="5"] @@ -84,6 +97,7 @@ points = PackedVector2Array(26, 150, 723, 150) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.8 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s08_囚室.tscn b/scene/ground/scene/c03/s08_囚室.tscn index 401d7e31..63940b3e 100644 --- a/scene/ground/scene/c03/s08_囚室.tscn +++ b/scene/ground/scene/c03/s08_囚室.tscn @@ -66,6 +66,7 @@ points = PackedVector2Array(37, 149, 539, 149) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.8 blend_mode = 1 [editable path="Ground"] diff --git a/scene/ground/scene/c03/s09_棺材房.tscn b/scene/ground/scene/c03/s09_棺材房.tscn index d7d11713..890ae52b 100644 --- a/scene/ground/scene/c03/s09_棺材房.tscn +++ b/scene/ground/scene/c03/s09_棺材房.tscn @@ -63,6 +63,7 @@ points = PackedVector2Array(80, 150, 474, 151) [node name="DirectionalLight2D" parent="Ground" index="8"] visible = false +energy = 0.85 blend_mode = 1 [editable path="Ground"]