Fixed Bugs
This commit is contained in:
parent
08ae4632d4
commit
f7d00a3381
5 changed files with 12 additions and 18 deletions
|
|
@ -88,10 +88,6 @@ down={
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
[input_devices]
|
|
||||||
|
|
||||||
pointing/emulate_touch_from_mouse=true
|
|
||||||
|
|
||||||
[internationalization]
|
[internationalization]
|
||||||
|
|
||||||
locale/locale_filter_mode=0
|
locale/locale_filter_mode=0
|
||||||
|
|
|
||||||
|
|
@ -28,7 +28,7 @@ var lastUID = 1
|
||||||
|
|
||||||
var currentUID = lastUID
|
var currentUID = lastUID
|
||||||
|
|
||||||
var time = 60
|
var time = 120
|
||||||
|
|
||||||
var lost = false
|
var lost = false
|
||||||
|
|
||||||
|
|
@ -42,7 +42,7 @@ func resetGame():
|
||||||
points = 0
|
points = 0
|
||||||
lastUID = 0
|
lastUID = 0
|
||||||
currentUID = lastUID
|
currentUID = lastUID
|
||||||
time = 60
|
time = 120
|
||||||
lost = false
|
lost = false
|
||||||
|
|
||||||
func _ready() -> void:
|
func _ready() -> void:
|
||||||
|
|
|
||||||
|
|
@ -285,11 +285,14 @@ func testRows():
|
||||||
splitOphansUID(j.UID)
|
splitOphansUID(j.UID)
|
||||||
if j.expand:
|
if j.expand:
|
||||||
GLOBAL.points += j.type * 2
|
GLOBAL.points += j.type * 2
|
||||||
GLOBAL.time += j.type * 4
|
GLOBAL.time += j.type
|
||||||
elif not j.expand:
|
elif not j.expand:
|
||||||
GLOBAL.points += j.type
|
GLOBAL.points += j.type
|
||||||
GLOBAL.time += j.type * 2
|
GLOBAL.time += j.type
|
||||||
j.queue_free()
|
j.queue_free()
|
||||||
for j in getBlockGroupsList():
|
for j in getBlockGroupsList():
|
||||||
if j != GLOBAL.currentUID:
|
if j != GLOBAL.currentUID:
|
||||||
moveUidGroup(GLOBAL.Direction.BOTTOM, j)
|
moveUidGroup(GLOBAL.Direction.BOTTOM, j)
|
||||||
|
|
||||||
|
func toggleButton():
|
||||||
|
$Camera2D/CanvasLayer/Control.toggleButton()
|
||||||
|
|
|
||||||
|
|
@ -3,19 +3,13 @@ extends Control
|
||||||
@onready var buttonContainer1 = $HBoxContainer3
|
@onready var buttonContainer1 = $HBoxContainer3
|
||||||
@onready var buttonContainer2 = $HBoxContainer4
|
@onready var buttonContainer2 = $HBoxContainer4
|
||||||
@onready var buttonContainer3 = $HBoxContainer5
|
@onready var buttonContainer3 = $HBoxContainer5
|
||||||
# Called when the node enters the scene tree for the first time.
|
|
||||||
func _ready() -> void:
|
func toggleButton():
|
||||||
print(DisplayServer.mouse_get_position() != Vector2i())
|
if DisplayServer.is_touchscreen_available():
|
||||||
if DisplayServer.mouse_get_position() == Vector2i():
|
|
||||||
buttonContainer1.show()
|
buttonContainer1.show()
|
||||||
buttonContainer2.show()
|
buttonContainer2.show()
|
||||||
buttonContainer3.show()
|
buttonContainer3.show()
|
||||||
|
|
||||||
# Called every frame. 'delta' is the elapsed time since the previous frame.
|
|
||||||
func _process(delta: float) -> void:
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
func _on_left_button_pressed() -> void:
|
func _on_left_button_pressed() -> void:
|
||||||
Input.action_press("left")
|
Input.action_press("left")
|
||||||
Input.action_release("left")
|
Input.action_release("left")
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@ func loadGrid():
|
||||||
if $ScoreOverview != null:
|
if $ScoreOverview != null:
|
||||||
$ScoreOverview.queue_free()
|
$ScoreOverview.queue_free()
|
||||||
add_child(load("res://scenes/Grid/grid.tscn").instantiate())
|
add_child(load("res://scenes/Grid/grid.tscn").instantiate())
|
||||||
|
$Grid.toggleButton()
|
||||||
|
|
||||||
func scoreOverview():
|
func scoreOverview():
|
||||||
if $Grid != null:
|
if $Grid != null:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue