Squashed commit from test branch. 更新c01s05院长房间场景与角色动画配置等

This commit is contained in:
cakipaul 2025-01-17 16:52:12 +08:00
parent 1e58baf371
commit 1749eba7ef
8 changed files with 576 additions and 564 deletions

1
.gitignore vendored
View File

@ -3,3 +3,4 @@
/android/
.DS_Store
*.import
*.translation

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@ bus/2/name = &"dialog"
bus/2/solo = false
bus/2/mute = false
bus/2/bypass_fx = false
bus/2/volume_db = -0.0327301
bus/2/volume_db = 0.0
bus/2/send = &"game_sfx"
bus/3/name = &"music"
bus/3/solo = false

View File

@ -17,6 +17,8 @@ func _ready() -> void:
func _set_config(val: GlobalConfig) -> void:
config = val
if Engine.is_editor_hint():
return
# set up window
if config.window_fullscreen:
get_window().mode = Window.MODE_FULLSCREEN

View File

@ -134,10 +134,10 @@ tracks/2/path = NodePath("DeployLayer/画框:rotation")
tracks/2/interp = 1
tracks/2/loop_wrap = true
tracks/2/keys = {
"times": PackedFloat32Array(1.2, 2.44),
"transitions": PackedFloat32Array(1, 1),
"times": PackedFloat32Array(1.2, 1.38, 1.64, 1.82, 1.98, 2.16),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
"update": 0,
"values": [-0.179974, 0.0]
"values": [-0.179974, -0.124821, -0.124821, -0.051063, -0.051063, 0.0]
}
tracks/3/type = "value"
tracks/3/imported = false
@ -219,6 +219,8 @@ resource_local_to_scene = true
size = Vector2(10, 70)
[node name="S05院长房间" type="Node2D"]
metadata/_edit_vertical_guides_ = [-45.0]
metadata/_edit_horizontal_guides_ = [88.0, 122.0]
[node name="Ground" parent="." instance=ExtResource("1_ff4yb")]
position = Vector2(1, 0)
@ -247,7 +249,7 @@ default_texture = ExtResource("4_gdhoy")
opened_texture = ExtResource("5_cddn7")
[node name="座钟" parent="Ground/DeployLayer" index="2" instance=ExtResource("6_v72k7")]
position = Vector2(334, 18)
position = Vector2(334, 22)
texture = ExtResource("7_3tetc")
texture_cover = ExtResource("7_3tetc")
editor_filter = "c01"
@ -258,7 +260,7 @@ position = Vector2(84, 47)
texture = ExtResource("7_xakd0")
[node name="钢琴" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_v72k7")]
position = Vector2(413, 49)
position = Vector2(413, 52)
texture = ExtResource("8_mnduo")
[node name="桌椅" parent="Ground/DeployLayer" index="5" instance=ExtResource("10_18v0g")]
@ -328,17 +330,17 @@ texture_scale = 0.33
height = 50.0
[node name="MainPlayer" parent="Ground" index="5"]
position = Vector2(261, 40)
character = "小小蝶"
[node name="FGSprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="0"]
position = Vector2(22, 49)
position = Vector2(22, 32)
texture = ExtResource("3_vmr0f")
[node name="HdLayer" parent="Ground/SubViewportContainer/SubViewport" index="0"]
layer = -1
[node name="DirectionalLight2D" parent="Ground" index="8"]
visible = false
rotation = -0.000622023
energy = 0.3
blend_mode = 1

View File

@ -1,8 +1,9 @@
[gd_scene load_steps=11 format=3 uid="uid://c4ycvdsabi7lw"]
[gd_scene load_steps=12 format=3 uid="uid://c4ycvdsabi7lw"]
[ext_resource type="Script" path="res://scene/index_page.gd" id="1_c7y7r"]
[ext_resource type="Texture2D" uid="uid://5xv603j8tuon" path="res://asset/art/ui/entrance/菜单背景1.png" id="1_jxn4k"]
[ext_resource type="PackedScene" uid="uid://c85t6stvytvjn" path="res://scene/entity/ux/sfx.tscn" id="2_cac5f"]
[ext_resource type="AudioStream" uid="uid://casyb01uck7nn" path="res://asset/audio/sfx/ui/click.wav" id="3_xdgc6"]
[ext_resource type="PackedScene" uid="uid://beok2r6fgburn" path="res://scene/settings/settings.tscn" id="4_5m37n"]
[sub_resource type="Animation" id="Animation_8kiap"]
@ -65,6 +66,7 @@ mouse_filter = 2
[node name="Sfx" parent="." instance=ExtResource("2_cac5f")]
unique_name_in_owner = true
stream = ExtResource("3_xdgc6")
[node name="TextureRect" type="TextureRect" parent="."]
layout_mode = 1

View File

@ -2,8 +2,8 @@
[ext_resource type="Script" path="res://scene/player/main_player.gd" id="1_3a78y"]
[ext_resource type="SpriteFrames" uid="uid://b7fhheih1hbvf" path="res://config/animation/entity_sprite_frames.tres" id="2_3w63u"]
[ext_resource type="Texture2D" uid="uid://bucpmiscjaem0" path="res://asset/art/ui/对话框.png" id="4_0qo0c"]
[ext_resource type="FontFile" uid="uid://coy0c115cjmv5" path="res://asset/font/MPLUS中文像素.TTF" id="4_4jk1c"]
[ext_resource type="Texture2D" uid="uid://bnnvdn60sc2bj" path="res://asset/art/ui/对话框.png" id="4_0qo0c"]
[ext_resource type="FontFile" uid="uid://dsy5mb1krhryj" path="res://asset/font/MPLUS中文像素.TTF" id="4_4jk1c"]
[ext_resource type="Script" path="res://addons/dialogue_manager/dialogue_label.gd" id="5_tclgd"]
[sub_resource type="RectangleShape2D" id="RectangleShape2D_fno82"]
@ -28,6 +28,8 @@ modulate_color = Color(0.996078, 0.92549, 0.85098, 0.733333)
position = Vector2(48, 0)
collision_mask = 2
script = ExtResource("1_3a78y")
metadata/_edit_vertical_guides_ = [-120.0]
metadata/_edit_horizontal_guides_ = [-9.0]
[node name="FootstepTimer" type="Timer" parent="."]
unique_name_in_owner = true
@ -89,6 +91,9 @@ seconds_per_pause_step = 0.15
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
unique_name_in_owner = true
position = Vector2(0, -9)
scale = Vector2(0.6, 0.6)
sprite_frames = ExtResource("2_3w63u")
animation = &"c00_吕萍_idle_right"
animation = &"c01_小小蝶_拿鸡毛掸子"
frame = 11
frame_progress = 1.0

View File

@ -78,7 +78,7 @@ const ANIMATION_CONFIG = {
"小小蝶":
{
"scale": Vector2.ONE,
"speed_walking": 65.0,
"speed_walking": 55.0,
"running_locked": false,
"speed_runnig": 100.0,
"walk_footstep": 0.5,