diff --git a/Florian/Map/chinese_ny_new.gd b/Florian/Map/chinese_ny_new.gd new file mode 100644 index 0000000..78b42c2 --- /dev/null +++ b/Florian/Map/chinese_ny_new.gd @@ -0,0 +1,59 @@ +extends Node3D + +var paused = false +var finished = false +var main_scene : PackedScene + +func _ready() -> void: + $PauseMenu.hide() + $PauseMenu.resume.connect(_on_resume_button_pressed) + $PauseMenu.main_menu.connect(_on_menu_button_pressed) + $FinishScreen.hide() + $FinishScreen.retry.connect(_on_retry_button_pressed) + $FinishScreen.exit.connect(_on_exit_button_pressed) + main_scene = load("res://Nikita/hub_scene.tscn") + +func _process(delta: float) -> void: + if Input.is_action_just_pressed("take_picture"): + await PictureTakeablesArray.calcualtion_finished + finish() + if Input.is_action_just_pressed("pause"): + pause_menu() + +func pause_menu(): + if paused: + $PauseMenu.hide() + get_tree().paused = false + Input.mouse_mode = Input.MOUSE_MODE_CAPTURED + else: + $PauseMenu.show() + get_tree().paused = true + paused = !paused + +func finish(): + if finished: + $FinishScreen.hide() + get_tree().paused = false + Input.mouse_mode = Input.MOUSE_MODE_CAPTURED + else: + $FinishScreen.show() + Input.mouse_mode = Input.MOUSE_MODE_VISIBLE + get_tree().paused = true + finished = !finished + +func _on_resume_button_pressed(): + pause_menu() + +func _on_menu_button_pressed(): + pause_menu() + get_tree().change_scene_to_packed(main_scene) + +func _on_retry_button_pressed(): + finish() + PictureTakeablesArray.picture_takables.clear() + PictureTakeablesArray.picture_spots.clear() + get_tree().reload_current_scene() + +func _on_exit_button_pressed(): + finish() + get_tree().change_scene_to_packed(main_scene) diff --git a/Florian/Map/chinese_ny_new.gd.uid b/Florian/Map/chinese_ny_new.gd.uid new file mode 100644 index 0000000..ec5bca1 --- /dev/null +++ b/Florian/Map/chinese_ny_new.gd.uid @@ -0,0 +1 @@ +uid://douec45766xq4 diff --git a/Florian/Map/chinese_ny_new.tscn b/Florian/Map/chinese_ny_new.tscn index ff9fac8..913cc76 100644 --- a/Florian/Map/chinese_ny_new.tscn +++ b/Florian/Map/chinese_ny_new.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=147 format=4 uid="uid://kcgefrq2227x"] +[gd_scene load_steps=148 format=4 uid="uid://kcgefrq2227x"] [ext_resource type="PackedScene" uid="uid://4qygsglmdow6" path="res://Amanda/temple_gate/source/01door.FBX.fbx" id="1_dr64d"] +[ext_resource type="Script" uid="uid://douec45766xq4" path="res://Florian/Map/chinese_ny_new.gd" id="1_qedqb"] [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="Texture2D" uid="uid://c7ssabp1bkod6" path="res://Amanda/china_street_model/textures/JiuTan01_001_M_diffuse.png" id="3_wg13h"] @@ -18,7 +19,7 @@ [ext_resource type="Texture2D" uid="uid://c0so272ko5xmv" 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://w207q4aq0uoc" 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="Script" uid="uid://bgolfgrq66diw" path="res://npc_path_follower.gd" id="17_3f12g"] [ext_resource type="PackedScene" uid="uid://dggx2w2c8xojc" path="res://Florian/PhysicsProps/firework.tscn" id="19_qqao8"] [ext_resource type="AudioStream" uid="uid://cr4l7i1y227ru" path="res://Florian/Audio/chineseAmbientMusicGame.ogg" id="20_72n5s"] [ext_resource type="Script" uid="uid://b7m4mddm1165v" path="res://Florian/Map/firework_spawn_locations.gd" id="21_yd64k"] @@ -41,8 +42,8 @@ [ext_resource type="Texture2D" uid="uid://b2aqyb00o810r" path="res://Amanda/china_street_model/textures/ShiDeng01_M_002_normal.png" id="39_2rndh"] [ext_resource type="Texture2D" uid="uid://btpxy7te145ql" path="res://Amanda/china_street_model/textures/ShiDeng01_M_003_diffuse.png" id="40_mymgw"] [ext_resource type="Texture2D" uid="uid://rb4g0qxcjaej" path="res://Amanda/RedSandyWhite_S.jpg" id="41_didix"] -[ext_resource type="PackedScene" path="res://Nikita/finish_screen.tscn" id="42_fyk3j"] -[ext_resource type="PackedScene" path="res://Nikita/pause_menu.tscn" id="43_qedqb"] +[ext_resource type="PackedScene" uid="uid://dl42xs7anteub" path="res://Nikita/finish_screen.tscn" id="42_fyk3j"] +[ext_resource type="PackedScene" uid="uid://ci05g3ilu86xl" path="res://Nikita/pause_menu.tscn" id="43_qedqb"] [sub_resource type="CylinderMesh" id="CylinderMesh_qqwfx"] top_radius = 50.0 @@ -904,6 +905,7 @@ shadow_mesh = SubResource("ArrayMesh_xoyb7") albedo_texture = ExtResource("41_didix") [node name="Node3D" type="Node3D"] +script = ExtResource("1_qedqb") [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.51628, -0.84374, -0.146829, 0.54363, -0.455343, 0.705074, -0.661756, 0.284195, 0.693767, -43.737, 41.9913, -213.601) @@ -1682,7 +1684,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -6.29522, -1.34709, -0.045004 curve = SubResource("Curve3D_hp67e") [node name="NPCPathFollower" type="PathFollow3D" parent="people/girl_path" node_paths=PackedStringArray("path")] -transform = Transform3D(-1, 0, 1.50996e-07, 0, 1, 0, -1.50996e-07, 0, -1, 0, 0, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) script = ExtResource("17_3f12g") speed = 10 path = NodePath("..") @@ -1706,7 +1708,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 94.4307, 0.57123, -0.0450044) curve = SubResource("Curve3D_hp67e") [node name="NPCPathFollower" type="PathFollow3D" parent="people/girl_path/girl_path" node_paths=PackedStringArray("path")] -transform = Transform3D(-1, 0, 1.50996e-07, 0, 1, 0, -1.50996e-07, 0, -1, 0, 0, 0) +transform = Transform3D(-1, 0, -8.74228e-08, 0, 1, 0, 8.74228e-08, 0, -1, 0, 0, 0) script = ExtResource("17_3f12g") speed = 10 path = NodePath("..") diff --git a/Florian/Player/cool_camera.gd b/Florian/Player/cool_camera.gd index 76913f1..894806f 100644 --- a/Florian/Player/cool_camera.gd +++ b/Florian/Player/cool_camera.gd @@ -64,6 +64,7 @@ func _calculate_picture_objects(): label.billboard = BaseMaterial3D.BILLBOARD_ENABLED label.fixed_size = true label.top_level = true + label.no_depth_test = true label.global_position = takeable.global_position label.font_size = 100 label.pixel_size = 0.001 @@ -92,7 +93,7 @@ func _calculate_picture_objects(): label.position += Vector3(0, 1, 0) total_points += points total_points_multipliers *= takeable.points_multiplier - takeable.show_red_cicle() + #takeable.show_red_cicle() func _calculate_picture_spots(): for spot in PictureTakeablesArray.picture_spots: diff --git a/Florian/Player/cool_camera.tscn b/Florian/Player/cool_camera.tscn index 809fde5..9101596 100644 --- a/Florian/Player/cool_camera.tscn +++ b/Florian/Player/cool_camera.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://4hac7s0wvoye"] [ext_resource type="Script" uid="uid://dff1mtnypemb4" path="res://Florian/Player/cool_camera.gd" id="1_87r7f"] -[ext_resource type="AudioStream" uid="uid://b87evhnkm1hs" path="res://Florian/Audio/flash-camera.mp3" id="2_xbt26"] +[ext_resource type="AudioStream" uid="uid://cwa0tnkwsqbsf" path="res://Florian/Audio/flash-camera.mp3" id="2_xbt26"] [node name="CoolCamera" type="Node3D"] script = ExtResource("1_87r7f") diff --git a/Nikita/ballon_gold.tscn b/Nikita/ballon_gold.tscn index 14e09ca..5754bdb 100644 --- a/Nikita/ballon_gold.tscn +++ b/Nikita/ballon_gold.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=4 format=3 uid="uid://b56u6jt4qr0i6"] +[gd_scene load_steps=4 format=3 uid="uid://c6l7apw6rqdqd"] [ext_resource type="PackedScene" uid="uid://dqtg4fdim4qay" path="res://Nikita/source/hot_air_balloon_-_low_poly.glb" id="1_5m5nl"] [ext_resource type="Texture2D" uid="uid://b645nd8b5125w" path="res://Nikita/source/hot_air_balloon_-_low_poly_3.png" id="2_5m5nl"] diff --git a/Nikita/finish_screen.tscn b/Nikita/finish_screen.tscn index 2ad53f7..158ae44 100644 --- a/Nikita/finish_screen.tscn +++ b/Nikita/finish_screen.tscn @@ -16,16 +16,17 @@ script = ExtResource("1_pfd8y") [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 1 -anchors_preset = 7 +anchors_preset = 8 anchor_left = 0.5 -anchor_top = 1.0 +anchor_top = 0.5 anchor_right = 0.5 -anchor_bottom = 1.0 +anchor_bottom = 0.5 offset_left = -147.5 -offset_top = -144.0 +offset_top = -72.0 offset_right = 147.5 +offset_bottom = 72.0 grow_horizontal = 2 -grow_vertical = 0 +grow_vertical = 2 [node name="VBoxContainer" type="VBoxContainer" parent="MarginContainer"] layout_mode = 2 @@ -48,6 +49,7 @@ layout_mode = 2 theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) theme_override_colors/font_outline_color = Color(0, 0, 0, 1) theme_override_constants/outline_size = 1 +theme_override_font_sizes/font_size = 42 text = "Score:" vertical_alignment = 1 @@ -56,6 +58,7 @@ layout_mode = 2 theme_override_colors/font_shadow_color = Color(0, 0, 0, 1) theme_override_colors/font_outline_color = Color(0, 0, 0, 1) theme_override_constants/outline_size = 1 +theme_override_font_sizes/font_size = 42 text = "999" horizontal_alignment = 2 vertical_alignment = 1