Коммит e7f47afa создал по автору tigisae's avatar tigisae
Просмотр файлов

Merge branch 'develop' into 'develop' 

Develop

See merge request tigisae/universo!5
владельцы cb1b5e69 cd1c67e6
Развернуть все Скрыть пробелы
Построчно Рядом
blokoj/asteroidoj/asteroid_1.tscn
Просмотр файла @ e7f47afa
Это отличие свёрнуто
blokoj/kosmo/scenoj/space.tscn
Просмотр файла @ e7f47afa
......@@ -169,7 +169,7 @@ __meta__ = {
[node name="loading" type="ColorRect" parent="ui"]
anchor_right = 1.0
anchor_bottom = 1.0
color = Color( 0, 0, 0, 0 )
color = Color( 0, 0, 0, 1 )
__meta__ = {
"_edit_use_anchors_": false
}
......
blokoj/kosmo/skriptoj/space.gd
Просмотр файла @ e7f47afa
......@@ -130,7 +130,7 @@ const base_ship = preload("res://blokoj/kosmosxipoj/scenoj/base_ship.tscn")
const espero = preload("res://blokoj/kosmostacioj/espero/espero_ekster.tscn")
const asteroido = preload("res://blokoj/asteroidoj/ast 6.tscn")
const asteroido = preload("res://blokoj/asteroidoj/asteroid_1.tscn")
# функция создания корабля
func create_ship(objecto):
......
blokoj/kosmosxipoj/scenoj/moduloj/engine.tscn
Просмотр файла @ e7f47afa
Этот отличия не может быть отображен по слишком большой. Вместо этого вы можете использовать просмотреть бинарные данные
blokoj/rajtigo/rajtigo.tscn
Просмотр файла @ e7f47afa
......@@ -73,7 +73,7 @@ margin_top = 80.0
margin_right = 485.0
margin_bottom = 110.0
custom_colors/font_color_selected = Color( 0, 0, 0, 1 )
max_length = 35
max_length = 24
caret_blink = true
caret_blink_speed = 0.5
__meta__ = {
......
kerno/fenestroj/tipo_a2.tscn 0 → 100644
Просмотр файла @ e7f47afa
[gd_scene format=2]
[node name="tipo_a2" type="Control"]
margin_left = 153.0
margin_top = 128.0
margin_right = 153.0
margin_bottom = 128.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="CanvasLayer" type="CanvasLayer" parent="."]
[node name="ColorRect" type="ColorRect" parent="CanvasLayer"]
anchor_top = -0.00128967
anchor_right = 0.0107422
anchor_bottom = 0.0287103
margin_left = 238.0
margin_top = 141.0
margin_right = 548.0
margin_bottom = 451.0
color = Color( 0, 0, 0, 0.294118 )
__meta__ = {
"_edit_use_anchors_": true
}
[node name="Label" type="Label" parent="CanvasLayer/ColorRect"]
anchor_right = 1.0
margin_bottom = 17.0
text = "Рекламное предложение"
align = 1
__meta__ = {
"_edit_use_anchors_": true
}
[node name="Popup" type="Popup" parent="CanvasLayer/ColorRect"]
visible = true
anchor_left = 0.0168739
anchor_top = -0.00471832
anchor_right = 0.0168739
anchor_bottom = -0.00471832
margin_left = 5.89395
margin_top = 19.2888
margin_right = 305.894
margin_bottom = 319.289
__meta__ = {
"_edit_use_anchors_": true
}
[node name="Timer" type="Timer" parent="CanvasLayer/ColorRect"]
autostart = true
kerno/menuo/menuo.gd
Просмотр файла @ e7f47afa
......@@ -42,11 +42,13 @@ func _on_cap_pressed():
$CanvasLayer/UI/com/com_real_rect.set_visible(false)
$CanvasLayer/UI/cap/cap_com_rect.set_visible(false)
$CanvasLayer/UI/cap/cap_real_rect.set_visible(false)
$CanvasLayer/UI/Lbar.color = Color(0.027451, 0.396078, 0.396078)
$CanvasLayer/UI/Lbar.color = Color(0.027451, 0.396078, 0.396078, 0.862745)
$CanvasLayer/UI/Lbar2.color = Color(0.027451, 0.396078, 0.396078, 0.862745)
$CanvasLayer/UI/Lbar3.color = Color(0.027451, 0.396078, 0.396078, 0.862745)
$CanvasLayer/UI/real/realLabel.set_visible(false)
$CanvasLayer/UI/com/comLabel.set_visible(false)
$CanvasLayer/UI/cap/capLabel.set_visible(true)
$CanvasLayer/UI/romb.color = Color(0.027451, 0.396078, 0.396078)
$CanvasLayer/UI/romb.color = Color(0.027451, 0.396078, 0.396078, 0.862745)
if Global.loading: #здесь вызывать задержку надо
var reload = false
......@@ -75,11 +77,13 @@ func _on_com_pressed():
$CanvasLayer/UI/com/com_real_rect.set_visible(false)
$CanvasLayer/UI/cap/cap_com_rect.set_visible(true)
$CanvasLayer/UI/cap/cap_real_rect.set_visible(false)
$CanvasLayer/UI/Lbar.color = Color(0.329412, 0.027451, 0.090196)
$CanvasLayer/UI/Lbar.color = Color(0.329412, 0.027451, 0.090196, 0.862745)
$CanvasLayer/UI/Lbar2.color = Color(0.329412, 0.027451, 0.090196, 0.862745)
$CanvasLayer/UI/Lbar3.color = Color(0.329412, 0.027451, 0.090196, 0.862745)
$CanvasLayer/UI/real/realLabel.set_visible(false)
$CanvasLayer/UI/com/comLabel.set_visible(true)
$CanvasLayer/UI/cap/capLabel.set_visible(false)
$CanvasLayer/UI/romb.color = Color(0.329412, 0.027451, 0.090196)
$CanvasLayer/UI/romb.color = Color(0.329412, 0.027451, 0.090196, 0.862745)
if Global.loading: #здесь вызывать задержку надо
var reload = false
......@@ -109,11 +113,13 @@ func _on_real_pressed():
$CanvasLayer/UI/com/com_real_rect.set_visible(true)
$CanvasLayer/UI/cap/cap_com_rect.set_visible(false)
$CanvasLayer/UI/cap/cap_real_rect.set_visible(true)
$CanvasLayer/UI/Lbar.color = Color(0.388235, 0.568627, 0.929412)
$CanvasLayer/UI/Lbar.color = Color(0.388235, 0.568627, 0.929412, 0.862745)
$CanvasLayer/UI/Lbar2.color = Color(0.388235, 0.568627, 0.929412, 0.862745)
$CanvasLayer/UI/Lbar3.color = Color(0.388235, 0.568627, 0.929412, 0.862745)
$CanvasLayer/UI/real/realLabel.set_visible(true)
$CanvasLayer/UI/com/comLabel.set_visible(false)
$CanvasLayer/UI/cap/capLabel.set_visible(false)
$CanvasLayer/UI/romb.color = Color(0.388235, 0.568627, 0.929412)
$CanvasLayer/UI/romb.color = Color(0.388235, 0.568627, 0.929412, 0.862745)
var reload = false
if Global.realeco!=1:
......
kerno/menuo/menuo.tscn
Просмотр файла @ e7f47afa
......@@ -77,13 +77,33 @@ __meta__ = {
}
[node name="Lbar" type="ColorRect" parent="CanvasLayer/UI"]
margin_left = 0.487671
margin_top = 50.5123
margin_right = 48.4877
margin_bottom = 599.512
color = Color( 0.388235, 0.568627, 0.929412, 1 )
anchor_bottom = 1.0
margin_top = 64.0
margin_right = 48.0
margin_bottom = 600.0
color = Color( 0.388235, 0.568627, 0.929412, 0.862745 )
__meta__ = {
"_edit_use_anchors_": false
"_edit_use_anchors_": true
}
[node name="Lbar2" type="ColorRect" parent="CanvasLayer/UI"]
margin_top = 51.0
margin_right = 35.0
margin_bottom = 64.0
color = Color( 0.388235, 0.568627, 0.929412, 0.862745 )
__meta__ = {
"_edit_use_anchors_": true
}
[node name="Lbar3" type="ColorRect" parent="CanvasLayer/UI"]
margin_left = 35.0
margin_top = 51.0
margin_right = 53.4
margin_bottom = 61.0
rect_rotation = 45.0
color = Color( 0.388235, 0.568627, 0.929412, 0.862745 )
__meta__ = {
"_edit_use_anchors_": true
}
[node name="romb" type="ColorRect" parent="CanvasLayer/UI"]
......@@ -92,7 +112,7 @@ margin_top = 49.0
margin_right = 55.0
margin_bottom = 68.0
rect_rotation = -45.0
color = Color( 0.388235, 0.568627, 0.929412, 1 )
color = Color( 0.388235, 0.568627, 0.929412, 0.862745 )
__meta__ = {
"_edit_use_anchors_": true
}
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать