diff --git a/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif b/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif old mode 100755 new mode 100644 index b1b693af..0bdd5b60 Binary files a/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif and b/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif differ diff --git a/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif.import b/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif.import index c6077790..67e58d92 100644 --- a/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif.import +++ b/asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif.import @@ -2,7 +2,7 @@ importer="gif.animated.texture.plugin" type="SpriteFrames" -uid="uid://o5poucsu57l7" +uid="uid://cramkual6vemp" path="res://.godot/imported/fg_花圃.gif-1cbdaf33bbc2d3e1d8081e40e5f51799.tres" [deps] diff --git a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn index a458cc96..26ee851e 100644 --- a/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn +++ b/scene/ground/scene/c01/s06_孤儿院长廊围墙.tscn @@ -20,7 +20,7 @@ [ext_resource type="PackedScene" uid="uid://bicuc35kbn8hd" path="res://scene/shading/fog.tscn" id="14_d5def"] [ext_resource type="Shader" uid="uid://bcfnbll451i2r" path="res://asset/shader/fog.gdshader" id="15_22a7a"] [ext_resource type="Texture2D" uid="uid://b7gyapghy3tsy" path="res://asset/art/neutral_point_light.png" id="15_q7j0p"] -[ext_resource type="SpriteFrames" uid="uid://o5poucsu57l7" path="res://asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif" id="15_wtosl"] +[ext_resource type="SpriteFrames" uid="uid://cramkual6vemp" path="res://asset/art/scene/c01/s06_孤儿院长廊围墙/fg_花圃.gif" id="15_wtosl"] [ext_resource type="Texture2D" uid="uid://dol25yn3fixim" path="res://asset/art/fog_mask.png" id="17_rdmp5"] [sub_resource type="Animation" id="Animation_723yg"] @@ -516,6 +516,7 @@ offset = Vector2(601.5, -0.5) [node name="MainPlayer" parent="Ground" index="5"] modulate = Color(0.931897, 0.931897, 0.931897, 1) position = Vector2(1575, 91) +character = "小小蝶" [node name="院长凳子" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"] position = Vector2(34, 3) diff --git a/scene/player/main_player.tscn b/scene/player/main_player.tscn index fc779b3a..d17bddc4 100644 --- a/scene/player/main_player.tscn +++ b/scene/player/main_player.tscn @@ -28,7 +28,6 @@ modulate_color = Color(0.996078, 0.92549, 0.85098, 0.733333) z_index = 5 collision_mask = 2 script = ExtResource("1_3a78y") -character = "小小蝶" running_locked = true metadata/_edit_vertical_guides_ = [-120.0] metadata/_edit_horizontal_guides_ = [-9.0] @@ -45,8 +44,8 @@ shape = SubResource("RectangleShape2D_fno82") unique_name_in_owner = true layout_mode = 3 anchors_preset = 0 -offset_top = -70.0 -offset_bottom = -70.0 +offset_top = -120.0 +offset_bottom = -120.0 mouse_filter = 2 [node name="MarginContainer" type="MarginContainer" parent="OSPivot"] @@ -95,6 +94,7 @@ seconds_per_pause_step = 0.15 [node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."] unique_name_in_owner = true light_mask = 9 +scale = Vector2(0.6, 0.6) sprite_frames = ExtResource("2_3w63u") -animation = &"c01_小小蝶_书店递报纸" -offset = Vector2(0, -37) +animation = &"c00_吕萍_idle_right" +offset = Vector2(0, -100)