From 292ad562736cc2f5a33443acb8cc2882c61f3483 Mon Sep 17 00:00:00 2001 From: Amanda Boegysanto Date: Thu, 18 Sep 2025 16:54:44 +0200 Subject: [PATCH] chinese --- Amanda/new_temple/sketchfab_scene.tscn | 59 ++++++ Florian/Map/chinese_ny.tscn | 257 +++++++++++++++++++------ 2 files changed, 260 insertions(+), 56 deletions(-) create mode 100644 Amanda/new_temple/sketchfab_scene.tscn diff --git a/Amanda/new_temple/sketchfab_scene.tscn b/Amanda/new_temple/sketchfab_scene.tscn new file mode 100644 index 0000000..edc8f0e --- /dev/null +++ b/Amanda/new_temple/sketchfab_scene.tscn @@ -0,0 +1,59 @@ +[gd_scene load_steps=11 format=3 uid="uid://c2keoh6007qya"] + +[ext_resource type="PackedScene" uid="uid://bvd3dl5rqgvh6" path="res://Amanda/new_temple/scene.gltf" id="1_drdxm"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l70ql"] +albedo_color = Color(0.823529, 0.219608, 0.0156863, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_56oad"] +albedo_color = Color(0.823529, 0.219608, 0.0156863, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_h31yj"] +albedo_color = Color(0.823529, 0.219608, 0.0156863, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ntak6"] +albedo_color = Color(0.498039, 0.207843, 0.0313726, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_j2nm7"] +albedo_color = Color(0.823529, 0.219608, 0.0156863, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_0mq6q"] +albedo_color = Color(0.498039, 0.207843, 0.0313726, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_6rmpp"] +albedo_color = Color(0.823529, 0.219608, 0.0156863, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ws1hq"] +albedo_color = Color(0.498039, 0.207843, 0.0313726, 1) + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_b5h3l"] +albedo_color = Color(0.498039, 0.207843, 0.0313726, 1) + +[node name="Sketchfab_Scene" instance=ExtResource("1_drdxm")] + +[node name="defaultMaterial25" parent="Sketchfab_model/Collada visual scene group/roof9" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_l70ql") + +[node name="defaultMaterial34" parent="Sketchfab_model/Collada visual scene group/polySurface24" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_56oad") + +[node name="defaultMaterial59" parent="Sketchfab_model/Collada visual scene group/second_floor29" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_h31yj") + +[node name="defaultMaterial104" parent="Sketchfab_model/Collada visual scene group/polySurface150" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_ntak6") + +[node name="defaultMaterial113" parent="Sketchfab_model/Collada visual scene group/second_floor19" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_j2nm7") + +[node name="defaultMaterial157" parent="Sketchfab_model/Collada visual scene group/polySurface96" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_0mq6q") + +[node name="defaultMaterial182" parent="Sketchfab_model/Collada visual scene group/second_floor10" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_6rmpp") + +[node name="defaultMaterial228" parent="Sketchfab_model/Collada visual scene group/polySurface42" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_ws1hq") + +[node name="defaultMaterial239" parent="Sketchfab_model/Collada visual scene group/Balcony18" index="0"] +surface_material_override/0 = SubResource("StandardMaterial3D_b5h3l") diff --git a/Florian/Map/chinese_ny.tscn b/Florian/Map/chinese_ny.tscn index 2a2e7da..59f30f3 100644 --- a/Florian/Map/chinese_ny.tscn +++ b/Florian/Map/chinese_ny.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=57 format=3 uid="uid://c117ys2e3arbi"] +[gd_scene load_steps=59 format=3 uid="uid://c117ys2e3arbi"] [ext_resource type="PackedScene" uid="uid://4qygsglmdow6" path="res://Amanda/temple_gate/source/01door.FBX.fbx" id="1_dr64d"] [ext_resource type="Texture2D" uid="uid://bnrri5m5k1c1a" path="res://Amanda/grass.png" id="2_r0dy2"] [ext_resource type="PackedScene" uid="uid://cvhj68arfuxaq" path="res://Amanda/lion/lion-500k.fbx" id="2_yh5on"] -[ext_resource type="PackedScene" uid="uid://bvd3dl5rqgvh6" path="res://Amanda/new_temple/scene.gltf" id="3_18065"] [ext_resource type="Texture2D" uid="uid://dmi4dxocjeelu" path="res://Amanda/Sprite assets/body.png" id="4_bsgyk"] [ext_resource type="Texture2D" uid="uid://dx7gypvy1eahr" path="res://Amanda/Sprite assets/head.png" id="5_tps7f"] [ext_resource type="Texture2D" uid="uid://dy5qkyjwpj42f" path="res://Amanda/Sprite assets/tail.png" id="6_8kkm8"] +[ext_resource type="PackedScene" uid="uid://c2keoh6007qya" path="res://Amanda/new_temple/sketchfab_scene.tscn" id="7_hp67e"] [ext_resource type="Texture2D" uid="uid://brr1r188nnu7c" path="res://Amanda/Sprite assets/guy_dragon.png" id="7_r0dy2"] [ext_resource type="PackedScene" uid="uid://crrco762ow56c" path="res://Florian/Player/PlayerRigidbody.tscn" id="8_tps7f"] [ext_resource type="Texture2D" uid="uid://by4qtiie7iop" path="res://Amanda/SandyDry_S.jpg" id="9_8kkm8"] @@ -16,6 +16,7 @@ [ext_resource type="Texture2D" uid="uid://cb1dwblmnwxcs" path="res://Amanda/Sprite assets/Untitled_Artwork-1 17.png" id="14_s4atm"] [ext_resource type="Texture2D" uid="uid://ciiwxhviiq2vy" path="res://Florian/Props/clothgrown.jpg" id="15_bowqk"] [ext_resource type="Texture2D" uid="uid://dvat0w2k6bb78" path="res://Amanda/Sprite assets/Untitled_Artwork-1 18.png" id="15_hp67e"] +[ext_resource type="Script" path="res://npc_path_follower.gd" id="17_3f12g"] [ext_resource type="Texture2D" uid="uid://btt01irygbpwr" path="res://Amanda/skybox/Skydome.png" id="17_hp67e"] [sub_resource type="CylinderMesh" id="CylinderMesh_qqwfx"] @@ -169,6 +170,50 @@ animations = [{ "speed": 5.0 }] +[sub_resource type="AtlasTexture" id="AtlasTexture_olbkl"] +atlas = ExtResource("7_r0dy2") +region = Rect2(0, 0, 50, 50) + +[sub_resource type="AtlasTexture" id="AtlasTexture_7aogo"] +atlas = ExtResource("7_r0dy2") +region = Rect2(0, 50, 50, 50) + +[sub_resource type="SpriteFrames" id="SpriteFrames_fvy46"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": SubResource("AtlasTexture_olbkl") +}, { +"duration": 1.0, +"texture": SubResource("AtlasTexture_7aogo") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hp67e"] +albedo_texture = ExtResource("15_bowqk") + +[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_3f12g"] +panorama = ExtResource("17_hp67e") + +[sub_resource type="Sky" id="Sky_qqao8"] +sky_material = SubResource("PanoramaSkyMaterial_3f12g") + +[sub_resource type="Environment" id="Environment_72n5s"] +background_mode = 2 +sky = SubResource("Sky_qqao8") +ambient_light_energy = 0.83 + +[sub_resource type="Curve3D" id="Curve3D_hp67e"] +bake_interval = 71.99 +_data = { +"points": PackedVector3Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 50, 0, 0, 0, 0, 0, 0, -50, 0, 75, 0, 0, 0, 0, 0, 0, -100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -50, 0, 0, 0, 0, 0, 0, 0, 0, 0), +"tilts": PackedFloat32Array(0, 0, 0, 0, 0, 0) +} +point_count = 6 + [sub_resource type="AtlasTexture" id="AtlasTexture_hp67e"] atlas = ExtResource("10_64lnl") region = Rect2(0, 0, 50, 50) @@ -219,41 +264,6 @@ animations = [{ "speed": 3.0 }] -[sub_resource type="AtlasTexture" id="AtlasTexture_olbkl"] -atlas = ExtResource("7_r0dy2") -region = Rect2(0, 0, 50, 50) - -[sub_resource type="AtlasTexture" id="AtlasTexture_7aogo"] -atlas = ExtResource("7_r0dy2") -region = Rect2(0, 50, 50, 50) - -[sub_resource type="SpriteFrames" id="SpriteFrames_fvy46"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": SubResource("AtlasTexture_olbkl") -}, { -"duration": 1.0, -"texture": SubResource("AtlasTexture_7aogo") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_hp67e"] -albedo_texture = ExtResource("15_bowqk") - -[sub_resource type="PanoramaSkyMaterial" id="PanoramaSkyMaterial_3f12g"] -panorama = ExtResource("17_hp67e") - -[sub_resource type="Sky" id="Sky_qqao8"] -sky_material = SubResource("PanoramaSkyMaterial_3f12g") - -[sub_resource type="Environment" id="Environment_72n5s"] -background_mode = 2 -sky = SubResource("Sky_qqao8") - [node name="Node3D" type="Node3D"] [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] @@ -264,7 +274,7 @@ light_volumetric_fog_energy = 3.0 light_angular_distance = 7.27 [node name="MeshInstance3D3" type="MeshInstance3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -63.4748, -0.34801, 23.2248) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -63.4748, -0.34801, 17.9661) mesh = SubResource("CylinderMesh_qqwfx") skeleton = NodePath("../MeshInstance3D") surface_material_override/0 = SubResource("StandardMaterial3D_cx38t") @@ -276,9 +286,74 @@ shape = SubResource("CylinderShape3D_s4atm") [node name="SpotLight3D" type="SpotLight3D" parent="MeshInstance3D3"] transform = Transform3D(1, 0, 0, 0, 0.000436382, 1, 0, -1, 0.000436382, 1.42281, 7.88169, 0) +light_color = Color(1, 0.403922, 0.333333, 1) light_energy = 10.0 spot_range = 15.0 +[node name="lantern_long" type="Sprite3D" parent="MeshInstance3D3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.8497, 12.1162, -15.2558) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="MeshInstance3D3/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 6.709 + +[node name="lantern_long2" type="Sprite3D" parent="MeshInstance3D3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 10.4237, 12.4098, -32.8092) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="MeshInstance3D3/lantern_long2"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 6.709 + +[node name="lantern_long3" type="Sprite3D" parent="MeshInstance3D3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.054, 11.9927, -15.7553) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="MeshInstance3D3/lantern_long3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 6.709 + +[node name="lantern_long4" type="Sprite3D" parent="MeshInstance3D3"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 27.8594, 11.9141, 4.47167) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="MeshInstance3D3/lantern_long4"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 6.709 + [node name="MeshInstance3D" type="MeshInstance3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -59.9524, -1.68268, 0) mesh = SubResource("BoxMesh_r0dy2") @@ -305,6 +380,15 @@ transform = Transform3D(0.0997822, 0, -0.00659606, 0, 0.1, 0, 0.00659606, 0, 0.0 [node name="lion-500k4" parent="01door_FBX" instance=ExtResource("2_yh5on")] transform = Transform3D(0.0991298, 0, -0.0131634, 0, 0.1, 0, 0.0131634, 0, 0.0991298, -47.4066, 0.942909, 34.3398) +[node name="01door_FBX3" parent="." instance=ExtResource("1_dr64d")] +transform = Transform3D(-0.0466391, 0, -1.99946, 0, 2.611, 0, 1.99946, 0, -0.0466391, -88.3717, -1.70738, 119.575) + +[node name="lion-500k" parent="01door_FBX3" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0499642, 0, -0.00249675, 0, 0.05, 0, 0.00189148, 0, 0.0659527, -61.9576, 0.67919, 33.7052) + +[node name="lion-500k2" parent="01door_FBX3" instance=ExtResource("2_yh5on")] +transform = Transform3D(0.0498499, 0, 0.00503218, 0, 0.05, 0, -0.00387091, 0, 0.0648049, -45.8792, 0.67919, 34.5272) + [node name="01door_FBX2" parent="." instance=ExtResource("1_dr64d")] transform = Transform3D(-2.49999, 0, -0.00437835, 0, 2.5, 0, 0.00571586, 0, -1.91499, -191.851, -1.69798, 1.00809) @@ -314,8 +398,8 @@ transform = Transform3D(0.0499642, 0, -0.00249675, 0, 0.05, 0, 0.00189148, 0, 0. [node name="lion-500k2" parent="01door_FBX2" instance=ExtResource("2_yh5on")] transform = Transform3D(0.0498499, 0, 0.00503218, 0, 0.05, 0, -0.00387091, 0, 0.0648049, -45.8792, 0.67919, 34.5272) -[node name="Sketchfab_Scene" parent="." instance=ExtResource("3_18065")] -transform = Transform3D(3, 0, 0, 0, 4, 0, 0, 0, 3, -62.853, 0.800093, 19.971) +[node name="Sketchfab_Scene3" parent="." instance=ExtResource("7_hp67e")] +transform = Transform3D(3, 0, 0, 0, 5, 0, 0, 0, 3, -63.7074, -0.48852, 19.9483) [node name="AnimatedSprite3D" type="AnimatedSprite3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -37.9022, 3.28465, 0.0125003) @@ -359,20 +443,6 @@ texture_filter = 0 sprite_frames = SubResource("SpriteFrames_hp67e") autoplay = "default" -[node name="girl" type="AnimatedSprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.2386, 1.03001, 0.0465164) -pixel_size = 0.05 -billboard = 2 -shaded = true -alpha_cut = 2 -texture_filter = 0 -sprite_frames = SubResource("SpriteFrames_lno8e") -autoplay = "default" - -[node name="PointThing" parent="girl" instance=ExtResource("10_qqwfx")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.360537, 0.0389547, 0) -points_name = "Girl" - [node name="drag_dude" type="AnimatedSprite3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -36.7959, 1.11476, 0.0465164) pixel_size = 0.05 @@ -389,6 +459,9 @@ points_name = "Drag_guy" [node name="Sketchfab_Scene2" parent="." instance=ExtResource("13_cx38t")] transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, 16.1517, -1.20172, 18.6903) +[node name="Sketchfab_Scene2" parent="Sketchfab_Scene2" instance=ExtResource("13_cx38t")] +transform = Transform3D(0.5, 0, 0, 0, 0.5, 0, 0, 0, 0.5, -330.285, 4.78484, -161.574) + [node name="lantern2" type="Sprite3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -61.9547, 11.7595, 48.3527) gi_mode = 2 @@ -492,7 +565,7 @@ light_size = 0.1 omni_range = 6.709 [node name="lantern5" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -91.2155, 11.325, 14.9006) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -92.4474, 11.325, 18.913) gi_mode = 2 pixel_size = 0.1 billboard = 2 @@ -509,7 +582,7 @@ light_size = 0.1 omni_range = 6.709 [node name="lantern3" type="Sprite3D" parent="."] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -77.8918, 11.7556, -5.59572) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -83.9136, 11.7556, -2.83962) gi_mode = 2 pixel_size = 0.1 billboard = 2 @@ -541,6 +614,54 @@ light_energy = 2.131 light_size = 0.1 omni_range = 6.709 +[node name="lantern_long" type="Sprite3D" parent="lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -24.4912, 0.299905, -1.03128) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 6.709 + +[node name="lantern_long" type="Sprite3D" parent="lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -13.0212, -0.0689516, -15.9424) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="lantern_long/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 6.709 + +[node name="lantern_long" type="Sprite3D" parent="lantern_long/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.2154, -0.0689516, -35.5423) +pixel_size = 0.1 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +texture = ExtResource("15_hp67e") + +[node name="OmniLight3D" type="OmniLight3D" parent="lantern_long/lantern_long/lantern_long/lantern_long"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.376202, -0.363543, 0.280273) +light_color = Color(1, 0.305882, 0.254902, 1) +light_energy = 2.131 +light_size = 0.1 +omni_range = 6.709 + [node name="CSGTorus3D" type="CSGTorus3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -62.1152, 13.3944, 18.3966) inner_radius = 30.0 @@ -549,3 +670,27 @@ material = SubResource("StandardMaterial3D_hp67e") [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = SubResource("Environment_72n5s") + +[node name="Path3D" type="Path3D" parent="."] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.799, 0.57123, -0.0450044) +curve = SubResource("Curve3D_hp67e") + +[node name="NPCPathFollower" type="PathFollow3D" parent="Path3D" node_paths=PackedStringArray("path")] +transform = Transform3D(-1, 0, 1.50996e-07, 0, 1, 0, -1.50996e-07, 0, -1, 0, 0, 0) +script = ExtResource("17_3f12g") +speed = 5 +path = NodePath("..") + +[node name="girl" type="AnimatedSprite3D" parent="Path3D/NPCPathFollower"] +transform = Transform3D(-1, 0, -1.50996e-07, 0, 1, 0, 1.50996e-07, 0, -1, 0.439631, 0.45878, -0.0915208) +pixel_size = 0.05 +billboard = 2 +shaded = true +alpha_cut = 2 +texture_filter = 0 +sprite_frames = SubResource("SpriteFrames_lno8e") +autoplay = "default" + +[node name="PointThing" parent="Path3D/NPCPathFollower/girl" instance=ExtResource("10_qqwfx")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.360537, 0.0389547, 0) +points_name = "Girl"