Просмотр исходного кода

bunch of fixes based on feedback, adding changelog

galo 1 год назад
Родитель
Сommit
663f83b4c9
6 измененных файлов с 81 добавлено и 17 удалено
  1. 12 6
      bacteria.tscn
  2. 1 1
      export_presets.cfg
  3. BIN
      font/ComfortaaRegular.ttf
  4. 30 10
      main.tscn
  5. 6 0
      newdynamicfont.tres
  6. 32 0
      ui/newtheme.tres

+ 12 - 6
bacteria.tscn

@@ -1,10 +1,11 @@
-[gd_scene load_steps=9 format=2]
+[gd_scene load_steps=10 format=2]
 
 [ext_resource path="res://bacteria.gd" type="Script" id=1]
 [ext_resource path="res://sprite/Besourinho.png" type="Texture" id=2]
 [ext_resource path="res://Health.tscn" type="PackedScene" id=3]
 [ext_resource path="res://hitbox.tscn" type="PackedScene" id=4]
 [ext_resource path="res://particles.tscn" type="PackedScene" id=5]
+[ext_resource path="res://newdynamicfont.tres" type="DynamicFont" id=6]
 
 [sub_resource type="RectangleShape2D" id=1]
 
@@ -220,7 +221,8 @@ anchor_bottom = 1.0
 
 [node name="Label" type="Label" parent="CanvasLayer/VBoxContainer"]
 margin_right = 540.0
-margin_bottom = 14.0
+margin_bottom = 19.0
+custom_fonts/font = ExtResource( 6 )
 text = "0"
 align = 1
 
@@ -229,13 +231,15 @@ modulate = Color( 3, 2, 0, 1 )
 show_behind_parent = true
 margin_right = 540.0
 margin_bottom = 14.0
+custom_fonts/font = ExtResource( 6 )
 max_value = 0.1
 percent_visible = false
 
 [node name="Label2" type="Label" parent="CanvasLayer/VBoxContainer"]
-margin_top = 18.0
+margin_top = 23.0
 margin_right = 540.0
-margin_bottom = 32.0
+margin_bottom = 42.0
+custom_fonts/font = ExtResource( 6 )
 text = "999"
 align = 1
 
@@ -246,14 +250,16 @@ margin_left = 3.0
 margin_top = 2.0
 margin_right = 543.0
 margin_bottom = 16.0
+custom_fonts/font = ExtResource( 6 )
 max_value = 50.0
 value = 20.0
 percent_visible = false
 
 [node name="Label3" type="Label" parent="CanvasLayer/VBoxContainer"]
-margin_top = 36.0
+margin_top = 46.0
 margin_right = 540.0
-margin_bottom = 50.0
+margin_bottom = 65.0
+custom_fonts/font = ExtResource( 6 )
 text = "Lv.1"
 align = 1
 

+ 1 - 1
export_presets.cfg

@@ -7,7 +7,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../Game Export/bacterium/0.1/bacterium odyssey 2.apk"
+export_path="../Game Export/bacterium/0.2/bacterium odyssey 5.apk"
 script_export_mode=1
 script_encryption_key=""
 

BIN
font/ComfortaaRegular.ttf


+ 30 - 10
main.tscn

@@ -1,10 +1,18 @@
-[gd_scene load_steps=13 format=2]
+[gd_scene load_steps=17 format=2]
 
 [ext_resource path="res://spawner.gd" type="Script" id=1]
 [ext_resource path="res://bacteria.tscn" type="PackedScene" id=2]
 [ext_resource path="res://restarter.gd" type="Script" id=3]
 [ext_resource path="res://Healthpickup.tscn" type="PackedScene" id=4]
 [ext_resource path="res://PowerUpControl.gd" type="Script" id=5]
+[ext_resource path="res://font/ComfortaaRegular.ttf" type="DynamicFontData" id=6]
+[ext_resource path="res://newdynamicfont.tres" type="DynamicFont" id=7]
+
+[sub_resource type="DynamicFont" id=8]
+font_data = ExtResource( 6 )
+
+[sub_resource type="Theme" id=9]
+default_font = SubResource( 8 )
 
 [sub_resource type="Shader" id=1]
 code = "// NOTE: Shader automatically converted from Godot Engine 3.4.4.stable's CanvasItemMaterial.
@@ -70,16 +78,19 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 300.0
 margin_right = -300.0
+theme = SubResource( 9 )
 
 [node name="VBoxContainer" type="VBoxContainer" parent="restarter/MarginContainer"]
-margin_right = 67.0
+margin_right = 89.0
 margin_bottom = 960.0
+theme = SubResource( 9 )
 alignment = 1
 
 [node name="Label" type="Label" parent="restarter/MarginContainer/VBoxContainer"]
 margin_top = 621.0
 margin_right = 120.0
 margin_bottom = 635.0
+custom_fonts/font = ExtResource( 7 )
 text = "game over"
 align = 1
 valign = 1
@@ -88,6 +99,7 @@ valign = 1
 margin_top = 639.0
 margin_right = 120.0
 margin_bottom = 659.0
+custom_fonts/font = ExtResource( 7 )
 text = "restart"
 
 [node name="PowerUpControl" type="CanvasLayer" parent="."]
@@ -100,41 +112,48 @@ anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 120.0
 margin_right = -120.0
+theme = SubResource( 9 )
 
 [node name="VSeparator" type="VBoxContainer" parent="PowerUpControl/Control"]
 margin_right = 300.0
 margin_bottom = 960.0
+theme = SubResource( 9 )
 alignment = 1
 
 [node name="Label" type="Label" parent="PowerUpControl/Control/VSeparator"]
-margin_top = 411.0
+margin_top = 408.0
 margin_right = 300.0
-margin_bottom = 425.0
+margin_bottom = 427.0
+custom_fonts/font = ExtResource( 7 )
 text = "Choose a power:"
 
 [node name="ItemList" type="ItemList" parent="PowerUpControl/Control/VSeparator"]
-margin_top = 429.0
+margin_top = 431.0
 margin_right = 300.0
-margin_bottom = 549.0
+margin_bottom = 551.0
 rect_min_size = Vector2( 0, 120 )
+custom_fonts/font = ExtResource( 7 )
 items = [ "Item 0", null, false, "Item 1", null, false, "Item 2", null, false, "Item 3", null, false, "Item 4", null, false ]
 
 [node name="VSeparator2" type="VBoxContainer" parent="PowerUpControl/Control"]
 margin_right = 300.0
 margin_bottom = 960.0
+theme = SubResource( 9 )
 alignment = 1
 
 [node name="Label" type="Label" parent="PowerUpControl/Control/VSeparator2"]
-margin_top = 411.0
+margin_top = 408.0
 margin_right = 300.0
-margin_bottom = 425.0
+margin_bottom = 427.0
+custom_fonts/font = ExtResource( 7 )
 text = "put on slot:"
 
 [node name="ItemList2" type="ItemList" parent="PowerUpControl/Control/VSeparator2"]
-margin_top = 429.0
+margin_top = 431.0
 margin_right = 300.0
-margin_bottom = 549.0
+margin_bottom = 551.0
 rect_min_size = Vector2( 0, 120 )
+custom_fonts/font = ExtResource( 7 )
 items = [ "Item 0", null, false, "Item 1", null, false, "Item 2", null, false ]
 
 [node name="CanvasLayer" type="CanvasLayer" parent="."]
@@ -144,6 +163,7 @@ layer = -1
 material = SubResource( 7 )
 anchor_right = 1.0
 anchor_bottom = 1.0
+theme = SubResource( 9 )
 
 [connection signal="dieproxy" from="bacteria" to="restarter" method="_on_bacteria_dieproxy"]
 [connection signal="level_up" from="bacteria" to="PowerUpControl" method="_on_bacteria_level_up"]

+ 6 - 0
newdynamicfont.tres

@@ -0,0 +1,6 @@
+[gd_resource type="DynamicFont" load_steps=2 format=2]
+
+[ext_resource path="res://font/ComfortaaRegular.ttf" type="DynamicFontData" id=1]
+
+[resource]
+font_data = ExtResource( 1 )

+ 32 - 0
ui/newtheme.tres

@@ -0,0 +1,32 @@
+[gd_resource type="Theme" load_steps=3 format=2]
+
+[ext_resource path="res://newdynamicfont.tres" type="DynamicFont" id=1]
+
+[sub_resource type="StyleBoxFlat" id=1]
+content_margin_left = 4.0
+content_margin_right = 4.0
+content_margin_top = 4.0
+content_margin_bottom = 4.0
+bg_color = Color( 0, 0.670588, 1, 1 )
+corner_radius_top_left = 10
+corner_radius_top_right = 10
+corner_radius_bottom_right = 10
+corner_radius_bottom_left = 10
+anti_aliasing = false
+
+[resource]
+default_font = ExtResource( 1 )
+ItemList/colors/font_color = Color( 1, 1, 1, 1 )
+ItemList/colors/font_color_selected = Color( 1, 0.701961, 0, 1 )
+ItemList/colors/guide_color = Color( 0, 0, 0, 0.1 )
+ItemList/constants/hseparation = 4
+ItemList/constants/icon_margin = 4
+ItemList/constants/line_separation = 2
+ItemList/constants/vseparation = 2
+ItemList/fonts/font = null
+ItemList/styles/bg = SubResource( 1 )
+ItemList/styles/bg_focus = null
+ItemList/styles/cursor = null
+ItemList/styles/cursor_unfocused = null
+ItemList/styles/selected = null
+ItemList/styles/selected_focus = null