diff --git a/asset/art/scene/c01/s04_旧版序章/fg_前景1.png b/asset/art/scene/c01/s04_旧版序章/fg_前景1.png index c8a6cb6d..0240c211 100644 Binary files a/asset/art/scene/c01/s04_旧版序章/fg_前景1.png and b/asset/art/scene/c01/s04_旧版序章/fg_前景1.png differ diff --git a/asset/art/scene/c01/s04_旧版序章/fg_前景3.png b/asset/art/scene/c01/s04_旧版序章/fg_前景3.png old mode 100755 new mode 100644 index 778fe69f..8adfa8c7 Binary files a/asset/art/scene/c01/s04_旧版序章/fg_前景3.png and b/asset/art/scene/c01/s04_旧版序章/fg_前景3.png differ diff --git a/asset/art/scene/c01/s09_黄包车长场景/bg_夜晚黄包车场景.png b/asset/art/scene/c01/s09_黄包车长场景/bg_夜晚黄包车场景.png index bb4fb8f6..10b7ab9f 100644 Binary files a/asset/art/scene/c01/s09_黄包车长场景/bg_夜晚黄包车场景.png and b/asset/art/scene/c01/s09_黄包车长场景/bg_夜晚黄包车场景.png differ diff --git a/asset/dialogue/c01.csv.import b/asset/dialogue/c01.csv.import index 9f8f965e..2191c3ff 100644 --- a/asset/dialogue/c01.csv.import +++ b/asset/dialogue/c01.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/c01.zh_CN.translation", "res://asset/dialogue/ [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/c02.csv.import b/asset/dialogue/c02.csv.import index cbea799c..3707b26b 100644 --- a/asset/dialogue/c02.csv.import +++ b/asset/dialogue/c02.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/c02.zh_CN.translation", "res://asset/dialogue/ [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/c03.csv.import b/asset/dialogue/c03.csv.import index 4f86c1a1..72dd3336 100644 --- a/asset/dialogue/c03.csv.import +++ b/asset/dialogue/c03.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/c03.zh_CN.translation"] [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/c04.csv.import b/asset/dialogue/c04.csv.import index 1ce0bcdb..9edcaedd 100644 --- a/asset/dialogue/c04.csv.import +++ b/asset/dialogue/c04.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/c04.zh_CN.translation"] [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/c05.csv.import b/asset/dialogue/c05.csv.import index e231e53c..9502874b 100644 --- a/asset/dialogue/c05.csv.import +++ b/asset/dialogue/c05.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/c05.zh_CN.translation"] [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/c06.csv.import b/asset/dialogue/c06.csv.import index 67f6592d..f4cd44a7 100644 --- a/asset/dialogue/c06.csv.import +++ b/asset/dialogue/c06.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/c06.zh_CN.translation"] [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/inspect_content.csv.import b/asset/dialogue/inspect_content.csv.import index db097ebe..bbe6a915 100644 --- a/asset/dialogue/inspect_content.csv.import +++ b/asset/dialogue/inspect_content.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/inspect_content.zh_CN.translation", "res://ass [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/item_description.csv.import b/asset/dialogue/item_description.csv.import index 2c2c0f0e..2170c6fd 100644 --- a/asset/dialogue/item_description.csv.import +++ b/asset/dialogue/item_description.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/item_description.zh_CN.translation", "res://as [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/names.csv.import b/asset/dialogue/names.csv.import index 8495300d..42667d31 100644 --- a/asset/dialogue/names.csv.import +++ b/asset/dialogue/names.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/names.zh_CN.translation", "res://asset/dialogu [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/npc.csv.import b/asset/dialogue/npc.csv.import index 50e41d36..971a3083 100644 --- a/asset/dialogue/npc.csv.import +++ b/asset/dialogue/npc.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/npc.zh_CN.translation", "res://asset/dialogue/ [params] -compress=true +compress=false delimiter=0 diff --git a/asset/dialogue/线索笔记.csv.import b/asset/dialogue/线索笔记.csv.import index 1f9bc43e..4840ace3 100644 --- a/asset/dialogue/线索笔记.csv.import +++ b/asset/dialogue/线索笔记.csv.import @@ -13,5 +13,5 @@ dest_files=["res://asset/dialogue/线索笔记.zh_CN.translation", "res://asset/ [params] -compress=true +compress=false delimiter=0 diff --git a/export_presets.cfg b/export_presets.cfg index 7a1bb009..0bd7754d 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -400,7 +400,7 @@ architectures/x86=false architectures/x86_64=false version/code=1 version/name="" -package/unique_name="com.example.$genname" +package/unique_name="com.baobaoding.xiandie" package/name="xiandie" package/signed=true package/app_category=2 diff --git a/scene/character/main_player.tscn b/scene/character/main_player.tscn index 50f6a0c5..16802eca 100644 --- a/scene/character/main_player.tscn +++ b/scene/character/main_player.tscn @@ -78,5 +78,5 @@ unique_name_in_owner = true light_mask = 9 scale = Vector2(0.5, 0.5) sprite_frames = ExtResource("2_3w63u") -animation = &"c00_吕萍_idle_left" +animation = &"c00_吕萍_idle_right" offset = Vector2(0, -100) diff --git a/scene/ground/scene/c01/s11_黄包车演出.gd b/scene/ground/scene/c01/s11_黄包车演出.gd index 5d8d410d..3f85d205 100644 --- a/scene/ground/scene/c01/s11_黄包车演出.gd +++ b/scene/ground/scene/c01/s11_黄包车演出.gd @@ -68,7 +68,7 @@ func pop_title_2(): func pop_title_3(): - SceneManager.pop_center_texture(title_3, 4) + SceneManager.pop_center_texture(title_3, 10.0) func _start_running(_res = null): diff --git a/scene/ground/scene/c01/s11_黄包车演出.tscn b/scene/ground/scene/c01/s11_黄包车演出.tscn index 764efb8c..eff82a57 100644 --- a/scene/ground/scene/c01/s11_黄包车演出.tscn +++ b/scene/ground/scene/c01/s11_黄包车演出.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=32 format=3 uid="uid://coiumaaenimbc"] +[gd_scene load_steps=28 format=3 uid="uid://coiumaaenimbc"] [ext_resource type="PackedScene" uid="uid://dayyx4jerj7io" path="res://scene/ground/ground.tscn" id="1_1sveo"] [ext_resource type="Script" uid="uid://dcn7u7v3fsscj" path="res://scene/ground/scene/c01/s11_黄包车演出.gd" id="2_espm6"] @@ -17,10 +17,7 @@ [ext_resource type="Texture2D" uid="uid://cgsq1im2q63f8" path="res://asset/art/scene/c01/s09_黄包车长场景/e_路灯灯芯.png" id="11_2w2ir"] [ext_resource type="Script" uid="uid://celg5or3mpla0" path="res://scene/ground/script/c01/s11_黄包车路灯.gd" id="11_6p5hp"] [ext_resource type="Texture2D" uid="uid://b7gyapghy3tsy" path="res://asset/art/neutral_point_light.png" id="12_2w2ir"] -[ext_resource type="Texture2D" uid="uid://7mbqqqamw8dr" path="res://asset/art/scene/c01/s09_黄包车长场景/前景/点缀 托车.png" id="14_2w2ir"] [ext_resource type="Texture2D" uid="uid://ghxwejhrp4v7" path="res://asset/art/scene/c01/s09_黄包车长场景/前景/点缀 推车三人组.png" id="15_jd8t2"] -[ext_resource type="Texture2D" uid="uid://cuu2fs61ec3qc" path="res://asset/art/scene/c01/s09_黄包车长场景/前景/点缀 黄包车车夫.png" id="16_amglq"] -[ext_resource type="Texture2D" uid="uid://dl43m88gcxwf" path="res://asset/art/scene/c01/s09_黄包车长场景/前景/点缀 车夫2.png" id="17_h4di6"] [ext_resource type="Texture2D" uid="uid://cylsq5cvhlp18" path="res://asset/art/tool/point_light.png" id="17_s11la"] [ext_resource type="Texture2D" uid="uid://ddoicafsbpriq" path="res://asset/art/scene/c01/s09_黄包车长场景/前景/第一段.png" id="18_68ynl"] [ext_resource type="Texture2D" uid="uid://cnftqdbxrxlov" path="res://asset/art/scene/c01/s09_黄包车长场景/前景/第二段.png" id="19_yajus"] @@ -138,12 +135,9 @@ size = Vector2(200, 100) [sub_resource type="RectangleShape2D" id="RectangleShape2D_jd8t2"] size = Vector2(30, 100) -[sub_resource type="AtlasTexture" id="AtlasTexture_amglq"] -atlas = ExtResource("4_1flr0") -region = Rect2(1240, 0, 611, 240) - [node name="S11" type="Node2D"] -metadata/_edit_horizontal_guides_ = [120.0] +metadata/_edit_horizontal_guides_ = [120.0, 120.0, -120.0] +metadata/_edit_vertical_guides_ = [5072.0] [node name="Ground" parent="." instance=ExtResource("1_1sveo")] scene_name = "c01_s11" @@ -204,20 +198,20 @@ sprite_frames = ExtResource("3_hnnuc") animation = &"c01_捡球男孩_关键帧" [node name="ambush_title1" parent="Ground/DeployLayer" index="4" instance=ExtResource("6_3k8jj")] -position = Vector2(1365, 4) +position = Vector2(1424, -1) trigger_mode = "area_enter" one_shot = false cooldown_time = 1.0 hook_method = "pop_title_1" [node name="ambush_title2" parent="Ground/DeployLayer" index="5" instance=ExtResource("6_3k8jj")] -position = Vector2(2870, -10) +position = Vector2(2348, 1) trigger_mode = "area_enter" one_shot = false hook_method = "pop_title_2" [node name="ambush_title3" parent="Ground/DeployLayer" index="6" instance=ExtResource("6_3k8jj")] -position = Vector2(6341, 3) +position = Vector2(5613, -1) trigger_mode = "area_enter" one_shot = false hook_method = "pop_title_3" @@ -627,26 +621,10 @@ limit_bottom = 384 focusing_node = NodePath("../DeployLayer/车夫与吕萍") force_offset = Vector2(80, -30) -[node name="点缀 黄包车车夫" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"] -position = Vector2(727, 80) -scale = Vector2(0.7, 0.7) -texture = ExtResource("16_amglq") - -[node name="点缀 车夫2" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="1"] -position = Vector2(7000, 84) -scale = Vector2(0.5, 0.5) -texture = ExtResource("17_h4di6") - -[node name="点缀 推车三人组" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="2"] -position = Vector2(7535, 94) -scale = Vector2(0.6, 0.6) +[node name="点缀 推车三人组" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="0"] +position = Vector2(7141, 116) texture = ExtResource("15_jd8t2") -[node name="点缀 托车" type="Sprite2D" parent="Ground/ParallaxForeground/BGParallaxLayer" index="3"] -position = Vector2(9731, 90) -scale = Vector2(0.6, 0.6) -texture = ExtResource("14_2w2ir") - [node name="FGParallaxLayer" parent="Ground/ParallaxForeground" index="1"] motion_scale = Vector2(1, 1) @@ -658,37 +636,21 @@ offset = Vector2(0, -50) [node name="FGSprite2D2" type="Sprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="1"] unique_name_in_owner = true -position = Vector2(839, -2) -scale = Vector2(1.18, 1.18) -texture = ExtResource("3_fduds") -centered = false -offset = Vector2(0, -120) - -[node name="FGSprite2D4" type="Sprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer/FGSprite2D2"] -unique_name_in_owner = true -position = Vector2(1709.32, 4.23729) -texture = ExtResource("3_fduds") -centered = false -offset = Vector2(0, -120) - -[node name="FGSprite2D3" type="Sprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer/FGSprite2D2"] -unique_name_in_owner = true -position = Vector2(868.644, -0.847458) +position = Vector2(730, 4) +scale = Vector2(1.1, 1.1) texture = ExtResource("3_fduds") centered = false offset = Vector2(0, -120) [node name="FGSprite2D3" type="Sprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="2"] -position = Vector2(6208, -17) -scale = Vector2(1.18, 1.18) -texture = SubResource("AtlasTexture_amglq") +position = Vector2(5345, -10) +texture = ExtResource("4_1flr0") centered = false offset = Vector2(0, -120) [node name="群像" type="Sprite2D" parent="Ground/ParallaxForeground/FGParallaxLayer" index="3"] unique_name_in_owner = true -position = Vector2(4650, 53) -scale = Vector2(0.6, 0.6) +position = Vector2(3748, 21) texture = ExtResource("19_yajus") centered = false