Pārlūkot izejas kodu

bunch of fixes based on feedback, adding changelog

galo 1 gadu atpakaļ
vecāks
revīzija
6bed63cac8
5 mainītis faili ar 48 papildinājumiem un 15 dzēšanām
  1. 1 1
      PowerUpControl.gd
  2. 1 4
      bacteria.gd
  3. 44 10
      main.tscn
  4. 1 0
      ui/Button.tscn
  5. 1 0
      ui/TouchScreenButton.gd

+ 1 - 1
PowerUpControl.gd

@@ -4,7 +4,7 @@ func openmenu():
 #	get_tree().paused = true
 	Engine.time_scale = 0.01
 	$Control2.show()
-	$AnimationPlayer.play("open")
+#	$AnimationPlayer.play("open")
 	$Control/VSeparator/Label.text = 'Choose a power:'
 	$Control/VSeparator/ItemList.clear()
 	var array = []

+ 1 - 4
bacteria.gd

@@ -85,7 +85,4 @@ func _on_hitbox_gotxp(arg):
 	$CanvasLayer/ProgressBar2.set_max( nextxp )
 	pass # Replace with function body.
 
-func _on_PowerUpControl_close_menu():
-#	_on_hitbox_gotxp(0)
-	print('close menu')
-	pass # Replace with function body.
+

+ 44 - 10
main.tscn

@@ -39,6 +39,30 @@ tracks/0/keys = {
 "update": 0,
 "values": [ Vector2( 80, 0 ) ]
 }
+tracks/1/type = "value"
+tracks/1/path = NodePath("Control2:rect_scale")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ Vector2( 1, 1 ) ]
+}
+tracks/2/type = "value"
+tracks/2/path = NodePath("Control2/VSeparator/buttons:scale")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/keys = {
+"times": PoolRealArray( 0 ),
+"transitions": PoolRealArray( 1 ),
+"update": 0,
+"values": [ Vector2( 1, 1 ) ]
+}
 
 [sub_resource type="Animation" id=13]
 resource_name = "open"
@@ -50,10 +74,22 @@ tracks/0/loop_wrap = true
 tracks/0/imported = false
 tracks/0/enabled = true
 tracks/0/keys = {
-"times": PoolRealArray( 0, 0.15, 0.25 ),
-"transitions": PoolRealArray( 1, 1, 1 ),
+"times": PoolRealArray( 0, 0.1, 0.3, 0.4 ),
+"transitions": PoolRealArray( 1, 1, 1, 1 ),
+"update": 0,
+"values": [ Vector2( -492, 0 ), Vector2( -492, 0 ), Vector2( 80, 0 ), Vector2( 80, 0 ) ]
+}
+tracks/1/type = "value"
+tracks/1/path = NodePath("Control2/VSeparator/buttons:scale")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/keys = {
+"times": PoolRealArray( -0.2, 0, 0.4, 0.55, 0.65 ),
+"transitions": PoolRealArray( 1, 1, 1, 1, 1 ),
 "update": 0,
-"values": [ Vector2( -492, 0 ), Vector2( 80, 0 ), Vector2( 80, 0 ) ]
+"values": [ Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 0, 0 ), Vector2( 1, 1 ), Vector2( 1, 1 ) ]
 }
 
 [sub_resource type="GDScript" id=11]
@@ -195,18 +231,18 @@ visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 80.0
-margin_right = -80.0
+margin_right = -80.0001
 theme = ExtResource( 10 )
 
 [node name="VSeparator" type="VBoxContainer" parent="PowerUpControl/Control2"]
-margin_right = 380.0
+margin_right = 379.0
 margin_bottom = 960.0
 theme = SubResource( 2 )
 alignment = 1
 
 [node name="Label" type="Label" parent="PowerUpControl/Control2/VSeparator"]
 margin_top = 154.0
-margin_right = 380.0
+margin_right = 379.0
 margin_bottom = 173.0
 theme = ExtResource( 10 )
 custom_fonts/font = ExtResource( 9 )
@@ -223,7 +259,7 @@ items = [ "Item 0", null, false, "Item 1", null, false, "Item 2", null, false, "
 
 [node name="ColorRect" type="ColorRect" parent="PowerUpControl/Control2/VSeparator"]
 margin_top = 177.0
-margin_right = 380.0
+margin_right = 379.0
 margin_bottom = 777.0
 rect_min_size = Vector2( 0, 600 )
 color = Color( 0.117647, 0.172549, 0.211765, 1 )
@@ -378,12 +414,11 @@ script = ExtResource( 8 )
 
 [node name="Button" type="Button" parent="PowerUpControl/Control2/VSeparator"]
 margin_top = 781.0
-margin_right = 380.0
+margin_right = 379.0
 margin_bottom = 806.0
 text = "accept"
 
 [node name="AnimationPlayer" type="AnimationPlayer" parent="PowerUpControl"]
-playback_speed = 5.0
 anims/RESET = SubResource( 12 )
 anims/open = SubResource( 13 )
 
@@ -423,7 +458,6 @@ autoplay = true
 [connection signal="dieproxy" from="bacteria" to="restarter" method="_on_bacteria_dieproxy"]
 [connection signal="level_up" from="bacteria" to="PowerUpControl" method="_on_bacteria_level_up"]
 [connection signal="button_down" from="restarter/MarginContainer/VBoxContainer/Button" to="restarter" method="_on_Button_button_down"]
-[connection signal="close_menu" from="PowerUpControl" to="bacteria" method="_on_PowerUpControl_close_menu"]
 [connection signal="item_activated" from="PowerUpControl/Control/VSeparator/ItemList" to="PowerUpControl" method="_on_ItemList_item_activated"]
 [connection signal="item_activated" from="PowerUpControl/Control2/VSeparator/ItemList" to="PowerUpControl" method="_on_ItemList_item_activated"]
 [connection signal="button_down" from="PowerUpControl/Control2/VSeparator/Button" to="PowerUpControl" method="_on_Button_button_down"]

+ 1 - 0
ui/Button.tscn

@@ -39,5 +39,6 @@ collision_mask = 0
 [node name="CollisionShape2D" type="CollisionShape2D" parent="col"]
 position = Vector2( 32, 32 )
 shape = SubResource( 1 )
+
 [connection signal="mouse_entered" from="Button" to="." method="_on_Button_mouse_entered"]
 [connection signal="mouse_exited" from="Button" to="." method="_on_Button_mouse_exited"]

+ 1 - 0
ui/TouchScreenButton.gd

@@ -17,6 +17,7 @@ func _physics_process(delta):
 	$Label.text = text
 	$Label.show()
 	global_position = initpos if posswitch else initpos2
+#	if posswitch: global_position = initpos2
 	if not posswitch: $Label.hide()
 #	$col/CollisionShape2D.call_deferred('set_disabled', false)
 	if is_pressed():