Sansan/GodotTest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Fix 29
All checks were successful
Build / build (push) Successful in 1m18s
Details

Browse Source
This commit is contained in:
Sebastian
2025-06-07 23:31:44 +02:00
parent b1ffda018b
commit 9ed0852a50
27 changed files with 119 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitea/workflows/gitea-build.yaml
View File

@@ -9,7 +9,7 @@ on:
branches: [main, develop]
env:
GODOT_VERSION: 4.3
GODOT_VERSION: 4.4
PROJECT_PATH: .
#GAME_VERSION: 0.0.8
#GAME_VERSION: ${{gitea.ref_name}}

2
.gitea/workflows/gitea-release.yaml
View File

@@ -10,7 +10,7 @@ on:
- '*.*'
env:
GODOT_VERSION: 4.3
GODOT_VERSION: 4.4
PROJECT_PATH: .
PROJECT_NAME: GodotTest
GAME_VERSION: ${{gitea.ref_name}}

22
export_presets.cfg
View File

@@ -10,8 +10,10 @@ export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
seed=0
encrypt_pck=false
encrypt_directory=false
script_export_mode=2
@@ -84,8 +86,10 @@ export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
seed=0
encrypt_pck=false
encrypt_directory=false
script_export_mode=2
@@ -106,7 +110,8 @@ application/short_version=""
application/version=""
application/copyright=""
application/copyright_localized={}
application/min_macos_version="10.12"
application/min_macos_version_x86_64="10.12"
application/min_macos_version_arm64="11.00"
application/export_angle=0
display/high_res=true
application/additional_plist_content=""
@@ -144,6 +149,7 @@ codesign/entitlements/app_sandbox/files_music=0
codesign/entitlements/app_sandbox/files_movies=0
codesign/entitlements/app_sandbox/files_user_selected=0
codesign/entitlements/app_sandbox/helper_executables=[]
codesign/entitlements/additional=""
codesign/custom_options=PackedStringArray()
notarization/notarization=0
privacy/microphone_usage_description=""
@@ -324,6 +330,7 @@ rm -rf \"{temp_dir}\""
dotnet/include_scripts_content=false
dotnet/include_debug_symbols=true
dotnet/embed_build_outputs=false
application/min_macos_version="10.12"
graphics/32_bits_framebuffer=true
xr_features/xr_mode=0
xr_features/degrees_of_freedom=0
@@ -519,8 +526,10 @@ export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path="../../gameoff.x86_64"
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
seed=0
encrypt_pck=false
encrypt_directory=false
script_export_mode=2
@@ -568,8 +577,10 @@ export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
seed=0
encrypt_pck=false
encrypt_directory=false
script_export_mode=2
@@ -795,8 +806,10 @@ export_filter="all_resources"
include_filter=""
exclude_filter=""
export_path=""
patches=PackedStringArray()
encryption_include_filters=""
encryption_exclude_filters=""
seed=0
encrypt_pck=false
encrypt_directory=false
script_export_mode=2
@@ -830,8 +843,10 @@ package/show_as_launcher_app=false
launcher_icons/main_192x192=""
launcher_icons/adaptive_foreground_432x432=""
launcher_icons/adaptive_background_432x432=""
launcher_icons/adaptive_monochrome_432x432=""
graphics/opengl_debug=false
xr_features/xr_mode=0
gesture/swipe_to_dismiss=false
screen/immersive_mode=true
screen/support_small=true
screen/support_normal=true
@@ -847,6 +862,7 @@ permissions/access_checkin_properties=false
permissions/access_coarse_location=false
permissions/access_fine_location=false
permissions/access_location_extra_commands=false
permissions/access_media_location=false
permissions/access_mock_location=false
permissions/access_network_state=false
permissions/access_surface_flinger=false
@@ -934,6 +950,10 @@ permissions/read_frame_buffer=false
permissions/read_history_bookmarks=false
permissions/read_input_state=false
permissions/read_logs=false
permissions/read_media_audio=false
permissions/read_media_images=false
permissions/read_media_video=false
permissions/read_media_visual_user_selected=false
permissions/read_phone_state=false
permissions/read_profile=false
permissions/read_sms=false

2
project.godot
View File

@@ -12,7 +12,7 @@ config_version=5
config/name="gameoff"
run/main_scene="res://scenes/Main.tscn"
config/features=PackedStringArray("4.3")
config/features=PackedStringArray("4.4")
config/icon="res://icon.png"
[autoload]

11
scenes/Arena.tscn Executable file → Normal file
View File

@@ -1,10 +1,9 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=3 format=3 uid="uid://c85js2cp046ql"]
[ext_resource path="res://scripts/Arena.gd" type="Script" id=1]
[ext_resource path="res://scenes/Background.tscn" type="PackedScene" id=2]
[ext_resource type="Script" uid="uid://cn17cecmiheuh" path="res://scripts/Arena.gd" id="1"]
[ext_resource type="PackedScene" path="res://scenes/Background.tscn" id="2"]
[node name="Arena" type="Node2D"]
script = ExtResource( 1 )
[node name="Background" parent="." instance=ExtResource( 2 )]
script = ExtResource("1")
[node name="Background" parent="." instance=ExtResource("2")]

17
scenes/Background.tscn Executable file → Normal file
View File

@@ -1,12 +1,10 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=3 format=3 uid="uid://b4wm7h10i1hih"]
[ext_resource path="res://scripts/ColoredEntity.gd" type="Script" id=1]
[ext_resource path="res://resources/img/2.png" type="Texture2D" id=2]
[ext_resource type="Script" uid="uid://dtqhtrcx6gb7u" path="res://scripts/ColoredEntity.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://sss8hj0itmbm" path="res://resources/img/2.png" id="2"]
[node name="Background" type="Node2D" groups=[
"ColoredEntity",
]]
script = ExtResource( 1 )
[node name="Background" type="Node2D" groups=["ColoredEntity"]]
script = ExtResource("1")
[node name="NinePatchRect" type="TextureRect" parent="."]
anchor_left = 0.0
@@ -17,12 +15,11 @@ offset_left = -199.0
offset_top = -157.0
offset_right = 2097.0
offset_bottom = 1217.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
mouse_filter = 1
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
texture = ExtResource( 2 )
texture = ExtResource("2")
stretch_mode = 2

22
scenes/Base.tscn Executable file → Normal file
View File

@@ -1,16 +1,12 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=3 format=3 uid="uid://cnv5rmxegl51c"]
[ext_resource path="res://scripts/Base.gd" type="Script" id=1]
[ext_resource type="Script" uid="uid://l36qwq5psa78" path="res://scripts/Base.gd" id="1"]
[sub_resource type="CircleShape2D" id=1]
custom_solver_bias = 0.0
[sub_resource type="CircleShape2D" id="1"]
radius = 68.9104
[node name="Base" type="Node2D" groups=[
"ColoredEntity",
]]
script = ExtResource( 1 )
[node name="Base" type="Node2D" groups=["ColoredEntity"]]
script = ExtResource("1")
[node name="ColorRect" type="ColorRect" parent="."]
anchor_left = 0.5
@@ -21,17 +17,17 @@ offset_left = -60.5
offset_top = -33.0
offset_right = 60.5
offset_bottom = 33.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
color = Color( 1, 1, 1, 1 )
color = Color(1, 1, 1, 1)
[node name="Body" type="Area2D" parent="."]
input_pickable = true
gravity_direction = Vector2( 0, 1 )
gravity_direction = Vector2(0, 1)
gravity = 98.0
linear_damp = 0.1
angular_damp = 1.0
@@ -41,6 +37,6 @@ audio_bus_override = false
audio_bus_name = "Master"
[node name="CollisionMask" type="CollisionShape2D" parent="Body"]
shape = SubResource( 1 )
shape = SubResource("1")
[connection signal="body_entered" from="Body" to="." method="_on_Body_body_entered"]

31
scenes/Cannon.tscn Executable file → Normal file
View File

@@ -1,12 +1,10 @@
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=3 format=3 uid="uid://b5bxa18dqh4od"]
[ext_resource path="res://scripts/Cannon.gd" type="Script" id=1]
[ext_resource path="res://resources/img/1.png" type="Texture2D" id=2]
[ext_resource type="Script" uid="uid://cev6hfc3virc7" path="res://scripts/Cannon.gd" id="1"]
[ext_resource type="Texture2D" uid="uid://c13lokwvlumq" path="res://resources/img/1.png" id="2"]
[node name="Cannon" type="Node2D" groups=[
"ColoredEntity",
]]
script = ExtResource( 1 )
[node name="Cannon" type="Node2D" groups=["ColoredEntity"]]
script = ExtResource("1")
[node name="Sprite2D" type="TextureRect" parent="."]
anchor_left = 0.0
@@ -16,33 +14,33 @@ anchor_bottom = 0.5
offset_top = -10.0
offset_right = 150.0
offset_bottom = 38.0
custom_minimum_size = Vector2( 150, 24 )
pivot_offset = Vector2( 10, 10 )
custom_minimum_size = Vector2(150, 24)
pivot_offset = Vector2(10, 10)
clip_contents = false
mouse_filter = 1
mouse_default_cursor_shape = 0
size_flags_horizontal = 0
size_flags_vertical = 0
texture = ExtResource( 2 )
texture = ExtResource("2")
stretch_mode = 2
[node name="GuideLine" type="Line2D" parent="Sprite2D"]
modulate = Color( 1, 1, 1, 0.1 )
modulate = Color(1, 1, 1, 0.1)
show_behind_parent = true
position = Vector2( 0, 10 )
points = PackedVector2Array( 135, 2, 2000, 2 )
position = Vector2(0, 10)
points = PackedVector2Array(135, 2, 2000, 2)
width = 5.0
default_color = Color( 1, 1, 1, 1 )
default_color = Color(1, 1, 1, 1)
texture_mode = 1
joint_mode = 2
sharp_limit = 2.0
round_precision = 10
[node name="CannonTip" type="Marker2D" parent="Sprite2D"]
position = Vector2( 120, 12 )
position = Vector2(120, 12)
[node name="CannonBase" type="Marker2D" parent="Sprite2D"]
position = Vector2( 0, 12 )
position = Vector2(0, 12)
[node name="Projectiles" type="Node" parent="."]
@@ -51,4 +49,3 @@ process_mode = 1
wait_time = 1.0
one_shot = true
autostart = true

7
scenes/ColoredEntity.tscn Executable file → Normal file
View File

@@ -1,7 +1,6 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=2 format=3 uid="uid://borh4suvgy34u"]
[ext_resource path="res://scripts/ColoredEntity.gd" type="Script" id=1]
[ext_resource type="Script" uid="uid://dtqhtrcx6gb7u" path="res://scripts/ColoredEntity.gd" id="1"]
[node name="ColoredEntity" type="Node2D"]
script = ExtResource( 1 )
script = ExtResource("1")

2
scenes/EnemyGenerator.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://b2fpxxnc2fq3o"]
[ext_resource type="Script" path="res://scripts/EnemyGenerator.gd" id="1"]
[ext_resource type="Script" uid="uid://bwqfrgjt1xlxu" path="res://scripts/EnemyGenerator.gd" id="1"]
[sub_resource type="Curve2D" id="1"]
_data = {

2
scenes/GLOBAL.tscn
View File

@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://cch0y3px40vrg"]
[ext_resource type="Script" path="res://scripts/GLOBAL.gd" id="1"]
[ext_resource type="Script" uid="uid://7n1rx7f1efie" path="res://scripts/GLOBAL.gd" id="1"]
[node name="GLOBAL" type="Node"]
script = ExtResource("1")

27
scenes/Game.tscn Executable file → Normal file
View File

@@ -1,21 +1,20 @@
[gd_scene load_steps=6 format=2]
[gd_scene load_steps=6 format=3 uid="uid://br0e6qqqcg5k8"]
[ext_resource path="res://scripts/Game.gd" type="Script" id=1]
[ext_resource path="res://scenes/Arena.tscn" type="PackedScene" id=2]
[ext_resource path="res://scenes/Player.tscn" type="PackedScene" id=3]
[ext_resource path="res://scenes/Base.tscn" type="PackedScene" id=4]
[ext_resource path="res://scenes/EnemyGenerator.tscn" type="PackedScene" id=5]
[ext_resource type="Script" uid="uid://7ronp3kgc55k" path="res://scripts/Game.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://c85js2cp046ql" path="res://scenes/Arena.tscn" id="2"]
[ext_resource type="PackedScene" path="res://scenes/Player.tscn" id="3"]
[ext_resource type="PackedScene" uid="uid://cnv5rmxegl51c" path="res://scenes/Base.tscn" id="4"]
[ext_resource type="PackedScene" uid="uid://b2fpxxnc2fq3o" path="res://scenes/EnemyGenerator.tscn" id="5"]
[node name="Game" type="Node2D"]
script = ExtResource( 1 )
script = ExtResource("1")
[node name="Arena" parent="." instance=ExtResource( 2 )]
[node name="Arena" parent="." instance=ExtResource("2")]
[node name="Player" parent="." instance=ExtResource( 3 )]
position = Vector2( 456.975, 971.301 )
[node name="Player" parent="." instance=ExtResource("3")]
position = Vector2(456.975, 971.301)
[node name="Base" parent="." instance=ExtResource( 4 )]
position = Vector2( 94.6306, 955.095 )
[node name="EnemyGenerator" parent="." instance=ExtResource( 5 )]
[node name="Base" parent="." instance=ExtResource("4")]
position = Vector2(94.6306, 955.095)
[node name="EnemyGenerator" parent="." instance=ExtResource("5")]

24
scenes/HUD.tscn Executable file → Normal file
View File

@@ -1,19 +1,19 @@
[gd_scene load_steps=2 format=2]
[gd_scene load_steps=2 format=3 uid="uid://1i57uk48okl"]
[ext_resource path="res://scripts/HUD.gd" type="Script" id=1]
[ext_resource type="Script" uid="uid://erod776k1xf7" path="res://scripts/HUD.gd" id="1"]
[node name="HUD" type="Control"]
anchor_left = 0.0
anchor_top = 0.0
anchor_right = 1.0
anchor_bottom = 1.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
mouse_filter = 0
mouse_default_cursor_shape = 0
size_flags_horizontal = 1
size_flags_vertical = 1
script = ExtResource( 1 )
script = ExtResource("1")
[node name="ThemeButtons" type="HBoxContainer" parent="."]
anchor_left = 0.0
@@ -24,7 +24,7 @@ offset_left = 1.0
offset_top = 84.0
offset_right = 496.0
offset_bottom = 196.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
mouse_filter = 1
mouse_default_cursor_shape = 0
@@ -39,7 +39,7 @@ anchor_right = 0.0
anchor_bottom = 0.0
offset_right = 63.0
offset_bottom = 112.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
focus_mode = 2
mouse_filter = 0
@@ -62,7 +62,7 @@ anchor_bottom = 0.0
offset_left = 67.0
offset_right = 130.0
offset_bottom = 112.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
focus_mode = 2
mouse_filter = 0
@@ -85,7 +85,7 @@ anchor_bottom = 0.0
offset_left = 134.0
offset_right = 197.0
offset_bottom = 112.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
focus_mode = 2
mouse_filter = 0
@@ -107,7 +107,7 @@ anchor_right = 0.0
anchor_bottom = 0.0
offset_right = 203.0
offset_bottom = 78.0
pivot_offset = Vector2( 0, 0 )
pivot_offset = Vector2(0, 0)
clip_contents = false
focus_mode = 2
mouse_filter = 0
@@ -122,7 +122,7 @@ text = "START"
flat = false
align = 1
[connection signal="pressed" from="ThemeButtons/Theme1" to="." method="_on_Theme_Button_pressed" binds= [ 0 ]]
[connection signal="pressed" from="ThemeButtons/Theme2" to="." method="_on_Theme_Button_pressed" binds= [ 1 ]]
[connection signal="pressed" from="ThemeButtons/Theme3" to="." method="_on_Theme_Button_pressed" binds= [ 2 ]]
[connection signal="pressed" from="ThemeButtons/Theme1" to="." method="_on_Theme_Button_pressed" binds= [0]]
[connection signal="pressed" from="ThemeButtons/Theme2" to="." method="_on_Theme_Button_pressed" binds= [1]]
[connection signal="pressed" from="ThemeButtons/Theme3" to="." method="_on_Theme_Button_pressed" binds= [2]]
[connection signal="pressed" from="StartButton" to="." method="_on_StartButton_pressed"]

6
scenes/Main.tscn
View File

@@ -1,8 +1,8 @@
[gd_scene load_steps=5 format=3 uid="uid://bo3no7bm4rb0n"]
[ext_resource type="Script" path="res://scripts/Main.gd" id="1"]
[ext_resource type="PackedScene" path="res://scenes/Game.tscn" id="2"]
[ext_resource type="PackedScene" path="res://scenes/HUD.tscn" id="3"]
[ext_resource type="Script" uid="uid://c14jqpnm4lmy3" path="res://scripts/Main.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://br0e6qqqcg5k8" path="res://scenes/Game.tscn" id="2"]
[ext_resource type="PackedScene" uid="uid://1i57uk48okl" path="res://scenes/HUD.tscn" id="3"]
[sub_resource type="Curve2D" id="1"]
_data = {

32
scenes/Player.tscn Executable file → Normal file
View File

@@ -1,26 +1,22 @@
[gd_scene load_steps=5 format=2]
[gd_scene load_steps=5 format=3 uid="uid://yqrktrylknhl"]
[ext_resource path="res://scripts/Player.gd" type="Script" id=1]
[ext_resource path="res://scenes/Cannon.tscn" type="PackedScene" id=2]
[ext_resource path="res://resources/img/cat0.png" type="Texture2D" id=3]
[ext_resource type="Script" uid="uid://bkrf46qmsle20" path="res://scripts/Player.gd" id="1"]
[ext_resource type="PackedScene" uid="uid://b5bxa18dqh4od" path="res://scenes/Cannon.tscn" id="2"]
[ext_resource type="Texture2D" uid="uid://b6au28glxf586" path="res://resources/img/cat0.png" id="3"]
[sub_resource type="CapsuleShape2D" id=1]
custom_solver_bias = 0.0
radius = 79.0755
[sub_resource type="CapsuleShape2D" id="1"]
radius = 44.7607
height = 89.5214
[node name="Player" type="Node2D" groups=[
"ColoredEntity",
]]
script = ExtResource( 1 )
[node name="Player" type="Node2D" groups=["ColoredEntity"]]
script = ExtResource("1")
[node name="Cannon" parent="." instance=ExtResource( 2 )]
position = Vector2( -50.0759, 40.2842 )
[node name="Cannon" parent="." instance=ExtResource("2")]
position = Vector2(-50.0759, 40.2842)
[node name="Sprite2D" type="Sprite2D" parent="."]
scale = Vector2( 0.5, 0.5 )
texture = ExtResource( 3 )
scale = Vector2(0.5, 0.5)
texture = ExtResource("3")
[node name="Body" type="CharacterBody2D" parent="."]
input_pickable = false
@@ -30,7 +26,7 @@ collision/safe_margin = 0.08
motion/sync_to_physics = false
[node name="Collision" type="CollisionShape2D" parent="Body"]
position = Vector2( -6.08298, -9.86302 )
shape = SubResource( 1 )
position = Vector2(-6.08298, -9.86302)
shape = SubResource("1")
[connection signal="unblock" from="." to="." method="_on_Player_unblock"]

4
scenes/Projectile.tscn
View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=7 format=3 uid="uid://dwr8aulhrbt85"]
[ext_resource type="Script" path="res://scripts/Projectile.gd" id="1"]
[ext_resource type="Script" path="res://scripts/ColoredEntity.gd" id="2"]
[ext_resource type="Script" uid="uid://cucl0a5760a35" path="res://scripts/Projectile.gd" id="1"]
[ext_resource type="Script" uid="uid://dtqhtrcx6gb7u" path="res://scripts/ColoredEntity.gd" id="2"]
[ext_resource type="Texture2D" uid="uid://my3jd38hyc7k" path="res://resources/img/missile-placeholder.png" id="3"]
[sub_resource type="PhysicsMaterial" id="PhysicsMaterial_13bxk"]

1
scripts/Arena.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://cn17cecmiheuh

1
scripts/Base.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://l36qwq5psa78

1
scripts/Cannon.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://cev6hfc3virc7

1
scripts/ColoredEntity.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://dtqhtrcx6gb7u

1
scripts/EnemyGenerator.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://bwqfrgjt1xlxu

1
scripts/GLOBAL.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://7n1rx7f1efie

1
scripts/Game.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://7ronp3kgc55k

1
scripts/HUD.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://erod776k1xf7

1
scripts/Main.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://c14jqpnm4lmy3

1
scripts/Player.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://bkrf46qmsle20

1
scripts/Projectile.gd.uid Normal file
View File

@@ -0,0 +1 @@
uid://cucl0a5760a35