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

Merge branch 'develop' into 'develop' 

#78, #105 переподключил авторизацию, исправил левый бар

See merge request tehnokom/universo!179
владельцы 1256b0a0 eebd8596
Скрыть пробелы
Построчно Рядом
blokoj/eliro/eliro.tscn
Просмотр файла @ 191b7483
......@@ -4,6 +4,7 @@
[ext_resource path="res://blokoj/eliro/eliro.gd" type="Script" id=2]
[node name="eliro" instance=ExtResource( 1 )]
visible = false
script = ExtResource( 2 )
[node name="HBox_buttons" parent="tipo_c" index="1"]
......
blokoj/kosmostacioj/Kosmostacio.tscn
Просмотр файла @ 191b7483
[gd_scene load_steps=3 format=2]
[gd_scene load_steps=4 format=2]
[ext_resource path="res://blokoj/kosmostacioj/kosmostacio.jpg" type="Texture" id=1]
[ext_resource path="res://blokoj/kosmostacioj/resursoj/CapKosmostacio/textures/Stars Sphere.jpg" type="Texture" id=1]
[ext_resource path="res://blokoj/kosmostacioj/Kosmostacio.gd" type="Script" id=2]
[ext_resource path="res://blokoj/rajtigo/tero.png" type="Texture" id=3]
[node name="Node2D" type="Node2D"]
script = ExtResource( 2 )
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
follow_viewport_enable = true
[node name="ParallaxBackground2" type="ParallaxBackground" parent="."]
[node name="TextureRect" type="TextureRect" parent="ParallaxBackground"]
[node name="TextureRect" type="TextureRect" parent="ParallaxBackground2"]
anchor_right = 1.0
anchor_bottom = 1.0
texture = ExtResource( 1 )
expand = true
stretch_mode = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
layer = -98
follow_viewport_enable = true
[node name="TextureRect" type="TextureRect" parent="ParallaxBackground"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -512.0
margin_top = -384.0
margin_right = 512.0
margin_bottom = 384.0
texture = ExtResource( 3 )
__meta__ = {
"_edit_use_anchors_": false
}
......@@ -23,21 +42,21 @@ anchor_left = 0.5
anchor_top = 1.0
anchor_right = 0.594
anchor_bottom = 1.0
margin_left = -5.548
margin_top = -31.556
margin_left = -5.54797
margin_top = -26.556
margin_right = 0.195984
margin_bottom = -19.556
margin_bottom = -9.55603
__meta__ = {
"_edit_use_anchors_": false
}
[node name="GreetingLabel" type="Label" parent="ParallaxBackground"]
anchor_left = 0.317
anchor_right = 0.708
margin_left = 0.0470276
margin_top = 70.0
margin_right = -0.336975
margin_bottom = 100.0
anchor_left = 1.0
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = -625.216
margin_top = -30.0
align = 1
valign = 1
__meta__ = {
......
blokoj/rajtigo/Start_page_menuo.gd 0 → 100644
Просмотр файла @ 191b7483
extends Control
func _ready():
pass # Replace with function body.
func _on_real_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_com_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_cap_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_mezo_regions_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_quick_actions_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_notifications_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_search_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_user_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_news_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_communities_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_academy_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_encyclopedia_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_komerco_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_Profilo_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_ad_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_Taskoj_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_RCentro_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_Objektoj_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_b_itinero_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_interago_button_up():
$CanvasLayer/UI/Popup.popup_centered()
func _on_eliro_button_up():
$CanvasLayer/UI/eliro/eliro.popup_centered()
func _on_Button_button_up():
$CanvasLayer/UI/Popup.popup_centered()
blokoj/rajtigo/Start_page_menuo.tscn 0 → 100644
Просмотр файла @ 191b7483
[gd_scene load_steps=9 format=2]
[ext_resource path="res://kerno/menuo/menuo.tscn" type="PackedScene" id=1]
[ext_resource path="res://kerno/menuo/scenoj/central_block.tscn" type="PackedScene" id=2]
[ext_resource path="res://blokoj/rajtigo/Start_page_menuo.gd" type="Script" id=3]
[ext_resource path="res://blokoj/rajtigo/auth_menuo.tscn" type="PackedScene" id=4]
[ext_resource path="res://blokoj/rajtigo/nadlo.png" type="Texture" id=5]
[ext_resource path="res://kerno/menuo/scenoj/bottom_2.tscn" type="PackedScene" id=6]
[ext_resource path="res://kerno/menuo/scenoj/bottom_3.tscn" type="PackedScene" id=7]
[ext_resource path="res://kerno/menuo/scenoj/bottom_1.tscn" type="PackedScene" id=8]
[node name="Start_page_menuo" instance=ExtResource( 1 )]
margin_right = 0.00012207
margin_bottom = -1.99994
script = ExtResource( 3 )
[node name="CanvasLayer" parent="." index="0"]
layer = -1
[node name="romb" parent="CanvasLayer/UI" index="4"]
anchor_bottom = 3.73258e-09
[node name="komerco" parent="CanvasLayer/UI/komerco" index="0"]
script = null
[node name="Window" parent="CanvasLayer/UI/Taskoj" index="0"]
script = null
[node name="Window" parent="CanvasLayer/UI/RCentro" index="0"]
script = null
[node name="Window" parent="CanvasLayer/UI/Objektoj" index="0"]
script = null
[node name="itinero" parent="CanvasLayer/UI/b_itinero" index="0"]
script = null
[node name="interago" parent="CanvasLayer/UI/interago" index="0"]
script = null
[node name="central_block" parent="CanvasLayer/UI" index="25" instance=ExtResource( 2 )]
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 59.0
margin_top = 60.0
margin_right = -12.0
margin_bottom = -193.0
[node name="future_button" type="Button" parent="CanvasLayer/UI/central_block" index="1"]
self_modulate = Color( 0.4, 0.6, 1, 0.862745 )
anchor_left = 0.5
anchor_top = 0.758
anchor_right = 0.5
anchor_bottom = 0.758
margin_left = -74.0
margin_top = -46.242
margin_right = 74.0
margin_bottom = -0.242004
mouse_default_cursor_shape = 2
[node name="TextureRect2" type="TextureRect" parent="CanvasLayer/UI/central_block/future_button" index="0"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -19.5
margin_top = 39.5
margin_right = 26.5
margin_bottom = 108.5
texture = ExtResource( 5 )
expand = true
__meta__ = {
"_edit_use_anchors_": true
}
[node name="Label" type="Label" parent="CanvasLayer/UI/central_block/future_button" index="1"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -46.0
margin_top = -12.5
margin_right = 46.0
margin_bottom = 12.5
text = "В будущее"
align = 1
valign = 1
[node name="Popup" parent="CanvasLayer/UI" index="26" instance=ExtResource( 4 )]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -264.0
margin_top = -135.0
margin_right = 264.0
margin_bottom = 135.0
[node name="HBox_bottom" type="HBoxContainer" parent="CanvasLayer/UI" index="27"]
anchor_top = 1.0
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 58.0
margin_top = -177.33
margin_right = -11.0
margin_bottom = -22.3303
custom_constants/separation = 15
__meta__ = {
"_edit_group_": true,
"_edit_use_anchors_": false
}
[node name="bottom_1" parent="CanvasLayer/UI/HBox_bottom" index="0" instance=ExtResource( 8 )]
margin_right = 500.0
margin_bottom = 154.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="bottom_2" parent="CanvasLayer/UI/HBox_bottom" index="1" instance=ExtResource( 6 )]
margin_left = 515.0
margin_right = 1015.0
margin_bottom = 154.0
size_flags_horizontal = 3
size_flags_vertical = 3
[node name="bottom_3" parent="CanvasLayer/UI/HBox_bottom" index="2" instance=ExtResource( 7 )]
margin_left = 1030.0
margin_right = 1531.0
margin_bottom = 154.0
size_flags_horizontal = 3
size_flags_vertical = 3
[connection signal="button_up" from="CanvasLayer/UI/real" to="." method="_on_real_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/com" to="." method="_on_com_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/cap" to="." method="_on_cap_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/mezo_regions" to="." method="_on_mezo_regions_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/quick_actions" to="." method="_on_quick_actions_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/notifications" to="." method="_on_notifications_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/search" to="." method="_on_search_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/user" to="." method="_on_user_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/news" to="." method="_on_news_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/communities" to="." method="_on_communities_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/academy" to="." method="_on_academy_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/encyclopedia" to="." method="_on_encyclopedia_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/Profilo" to="." method="_on_Profilo_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/ad" to="." method="_on_ad_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/Taskoj" to="." method="_on_Taskoj_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/RCentro" to="." method="_on_RCentro_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/Objektoj" to="." method="_on_Objektoj_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/b_itinero" to="." method="_on_b_itinero_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/interago" to="." method="_on_interago_button_up"]
[connection signal="button_up" from="CanvasLayer/UI/central_block/future_button" to="." method="_on_Button_button_up"]
blokoj/rajtigo/auth_menuo.gd 0 → 100644
Просмотр файла @ 191b7483
extends Popup
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
func _on_Button_x_button_up():
self.set_visible(false)
pass # Replace with function body.
blokoj/rajtigo/auth_menuo.tscn 0 → 100644
Просмотр файла @ 191b7483
[gd_scene load_steps=3 format=2]
[ext_resource path="res://blokoj/rajtigo/for_auth.tscn" type="PackedScene" id=1]
[ext_resource path="res://blokoj/rajtigo/auth_menuo.gd" type="Script" id=2]
[node name="Popup" type="Popup"]
visible = true
margin_right = 528.0
margin_bottom = 270.0
rect_min_size = Vector2( 200, 200 )
script = ExtResource( 2 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="for_auth" parent="." instance=ExtResource( 1 )]
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = 0.0
margin_bottom = 0.0
[node name="Button_x" type="Button" parent="for_auth"]
anchor_left = 1.0
anchor_right = 1.0
margin_left = -19.2385
margin_top = -0.0561218
margin_right = -0.238464
margin_bottom = 22.9439
rect_min_size = Vector2( 19, 23 )
size_flags_horizontal = 8
text = "x"
__meta__ = {
"_edit_use_anchors_": false
}
[connection signal="button_up" from="for_auth/Button_x" to="." method="_on_Button_x_button_up"]
blokoj/rajtigo/for_auth.gd 0 → 100644
Просмотр файла @ 191b7483
extends "res://kerno/wablono/estonteco/fenestroj.gd"
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready():
pass # Replace with function body.
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass
blokoj/rajtigo/for_auth.tscn 0 → 100644
Просмотр файла @ 191b7483
[gd_scene load_steps=7 format=2]
[ext_resource path="res://blokoj/rajtigo/for_auth.gd" type="Script" id=1]
[ext_resource path="res://kerno/wablono/estonteco/fenestroj.tscn" type="PackedScene" id=2]
[ext_resource path="res://kerno/menuo/resursoj/fonts/Buttons_hover.tres" type="StyleBox" id=3]
[ext_resource path="res://blokoj/rajtigo/skriptoj/login_button.gd" type="Script" id=4]
[ext_resource path="res://blokoj/rajtigo/skriptoj/message.gd" type="Script" id=5]
[ext_resource path="res://kerno/menuo/resursoj/fonts/button_style.tres" type="StyleBox" id=6]
[node name="for_auth" instance=ExtResource( 2 )]
margin_right = 528.0
margin_bottom = 270.0
rect_min_size = Vector2( 200, 200 )
script = ExtResource( 1 )
[node name="VBox" parent="." index="0"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = -1.52588e-05
margin_bottom = -1.52588e-05
[node name="HBox_top" parent="VBox" index="0"]
margin_right = 528.0
[node name="top_texture1" parent="VBox/HBox_top" index="0"]
self_modulate = Color( 0, 0, 0, 0.745098 )
[node name="top_texture2" parent="VBox/HBox_top" index="1"]
self_modulate = Color( 0, 0, 0, 0.745098 )
margin_right = 528.0
[node name="body_texture" parent="VBox" index="1"]
margin_right = 528.0
margin_bottom = 247.0
[node name="LoginButton" type="Button" parent="VBox/body_texture" index="0"]
anchor_left = 0.139474
anchor_top = 0.173077
anchor_right = 0.139474
anchor_bottom = 0.173077
margin_left = 285.0
margin_top = 153.0
margin_right = 405.0
margin_bottom = 186.0
custom_styles/hover = ExtResource( 3 )
custom_styles/focus = ExtResource( 6 )
text = "Sign In"
flat = true
script = ExtResource( 4 )
__meta__ = {
"_edit_use_anchors_": true
}
[node name="message" type="Label" parent="VBox/body_texture" index="1"]
visible = false
anchor_left = 0.139474
anchor_top = 0.173077
anchor_right = 0.139474
anchor_bottom = 0.173077
margin_left = -45.0
margin_top = -22.0
margin_right = 425.0
margin_bottom = 13.0
custom_styles/normal = ExtResource( 6 )
custom_colors/font_color = Color( 0.968627, 0.0431373, 0.0431373, 1 )
align = 1
valign = 1
script = ExtResource( 5 )
__meta__ = {
"_edit_use_anchors_": true
}
[node name="your_login" type="LineEdit" parent="VBox/body_texture" index="2"]
anchor_left = 0.139474
anchor_top = 0.173077
anchor_right = 0.139474
anchor_bottom = 0.173077
margin_left = 175.0
margin_top = 33.0
margin_right = 425.0
margin_bottom = 63.0
custom_colors/font_color_selected = Color( 0, 0, 0, 1 )
max_length = 35
caret_blink = true
caret_blink_speed = 0.5
__meta__ = {
"_edit_use_anchors_": true
}
[node name="your_password" type="LineEdit" parent="VBox/body_texture" index="3"]
anchor_left = 0.139474
anchor_top = 0.173077
anchor_right = 0.139474
anchor_bottom = 0.173077
margin_left = 175.0
margin_top = 93.0
margin_right = 425.0
margin_bottom = 123.0
max_length = 24
secret = true
caret_blink = true
caret_blink_speed = 0.5
__meta__ = {
"_edit_use_anchors_": true
}
[node name="login" type="Label" parent="VBox/body_texture" index="4"]
anchor_left = 0.139474
anchor_top = 0.173077
anchor_right = 0.139474
anchor_bottom = 0.173077
margin_left = -45.0
margin_top = 35.0
margin_right = 175.0
margin_bottom = 61.0
custom_styles/normal = ExtResource( 6 )
text = "Username"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": true
}
[node name="password" type="Label" parent="VBox/body_texture" index="5"]
anchor_left = 0.139474
anchor_top = 0.173077
anchor_right = 0.139474
anchor_bottom = 0.173077
margin_left = -45.0
margin_top = 95.0
margin_right = 175.0
margin_bottom = 121.0
custom_styles/normal = ExtResource( 6 )
text = "Password"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": true
}
[node name="LinkButton" type="LinkButton" parent="VBox/body_texture" index="6"]
margin_left = 49.0
margin_top = 199.0
margin_right = 297.0
margin_bottom = 216.0
text = "https://universo.su/registrado"
underline = 1
__meta__ = {
"_edit_use_anchors_": false
}
[node name="HBox_bottom" parent="VBox" index="2"]
margin_top = 247.0
margin_right = 528.0
margin_bottom = 269.0
[node name="bottom_texture1" parent="VBox/HBox_bottom" index="0"]
margin_right = 506.0
[node name="bottom_texture2" parent="VBox/HBox_bottom" index="1"]
margin_left = 506.0
margin_right = 528.0
blokoj/rajtigo/logo12 (3).png.import 0 → 100644
Просмотр файла @ 191b7483
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/logo12 (3).png-68037a08c904e7e36c168356f659015b.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://blokoj/rajtigo/logo12 (3).png"
dest_files=[ "res://.import/logo12 (3).png-68037a08c904e7e36c168356f659015b.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
blokoj/rajtigo/nadlo.png.import 0 → 100644
Просмотр файла @ 191b7483
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/nadlo.png-941e011f98184f133debfb38046cc72e.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://blokoj/rajtigo/nadlo.png"
dest_files=[ "res://.import/nadlo.png-941e011f98184f133debfb38046cc72e.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
blokoj/rajtigo/rajtigo.gd
Просмотр файла @ 191b7483
......@@ -9,9 +9,9 @@ func _ready():
if Global.autoload:
var password = config.get_value("aliro", "password")
var login = config.get_value("aliro", "uzanto")
$Control/LoginButton.eniri_uzanto(login, password)
$"Start_page_menuo/CanvasLayer/UI/Popup/for_auth/VBox/body_texture/LoginButton".eniri_uzanto(login, password)
elif Global.server:
$Control/LoginButton.eniri_server()
$"Start_page_menuo/CanvasLayer/UI/Popup/for_auth/VBox/body_texture/LoginButton".eniri_server()
# else:
......@@ -20,7 +20,7 @@ func _ready():
# config.set_value('aliro','user','server')
# config.set_value('aliro','password','12345678')
# config.save("user://settings.cfg")
# Вызывается при открытии сцены
......@@ -29,7 +29,7 @@ func _enter_tree():
Title.set_visible(false)
# Скрываем символы в поле для ввода пароля
$Control/your_password.set_secret(true)
$"Start_page_menuo/CanvasLayer/UI/Popup/for_auth/VBox/body_texture/your_password".set_secret(true)
# Вызывается при закрытии сцены
......
blokoj/rajtigo/rajtigo.tscn
Просмотр файла @ 191b7483
[gd_scene load_steps=10 format=2]
[ext_resource path="res://blokoj/rajtigo/tero.png" type="Texture" id=1]
[ext_resource path="res://kerno/menuo/resursoj/fonts/button_style.tres" type="StyleBox" id=3]
[ext_resource path="res://kerno/menuo/resursoj/fonts/Buttons_hover.tres" type="StyleBox" id=4]
[ext_resource path="res://blokoj/rajtigo/skriptoj/login_button.gd" type="Script" id=5]
[ext_resource path="res://resursoj/stelamapo_8k.jpg" type="Texture" id=6]
[ext_resource path="res://blokoj/rajtigo/rajtigo.gd" type="Script" id=7]
[ext_resource path="res://blokoj/rajtigo/skriptoj/message.gd" type="Script" id=9]
[ext_resource path="res://blokoj/rajtigo/Start_page_menuo.tscn" type="PackedScene" id=8]
[ext_resource path="res://blokoj/rajtigo/skriptoj/ru.gd" type="Script" id=10]
[ext_resource path="res://blokoj/rajtigo/skriptoj/en.gd" type="Script" id=11]
[ext_resource path="res://blokoj/rajtigo/skriptoj/eo.gd" type="Script" id=12]
......@@ -13,8 +13,9 @@
[node name="auth_menu" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_left = 0.773926
margin_right = 0.773926
margin_left = 1.0
margin_right = -1599.0
margin_bottom = -1024.0
size_flags_horizontal = 4
size_flags_vertical = 4
script = ExtResource( 7 )
......@@ -22,173 +23,92 @@ __meta__ = {
"_edit_use_anchors_": false
}
[node name="Control" type="Control" parent="."]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -250.0
margin_top = -125.0
margin_right = 250.0
margin_bottom = 125.0
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
}
[node name="LoginButton" type="Button" parent="Control"]
margin_left = 345.0
margin_top = 200.0
margin_right = 465.0
margin_bottom = 233.0
custom_styles/hover = ExtResource( 4 )
custom_styles/focus = ExtResource( 3 )
text = "Sign In"
flat = true
script = ExtResource( 5 )
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
}
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
[node name="message" type="Label" parent="Control"]
visible = false
margin_left = 15.0
margin_top = 25.0
margin_right = 485.0
margin_bottom = 60.0
custom_styles/normal = ExtResource( 3 )
custom_colors/font_color = Color( 0.968627, 0.0431373, 0.0431373, 1 )
align = 1
valign = 1
script = ExtResource( 9 )
[node name="TextureRect" type="TextureRect" parent="ParallaxBackground"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = -100.0
margin_right = 0.00012207
margin_bottom = 120.0
texture = ExtResource( 6 )
expand = true
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
"_edit_use_anchors_": false
}
[node name="your_login" type="LineEdit" parent="Control"]
margin_left = 235.0
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
caret_blink = true
caret_blink_speed = 0.5
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
}
[node name="ParallaxBackground2" type="ParallaxBackground" parent="."]
layer = -98
[node name="your_password" type="LineEdit" parent="Control"]
margin_left = 235.0
margin_top = 140.0
margin_right = 485.0
margin_bottom = 170.0
max_length = 24
secret = true
caret_blink = true
caret_blink_speed = 0.5
[node name="TextureRect" type="TextureRect" parent="ParallaxBackground2"]
anchor_left = 0.5
anchor_top = 0.5
anchor_right = 0.5
anchor_bottom = 0.5
margin_left = -512.0
margin_top = -384.0
margin_right = 512.0
margin_bottom = 384.0
texture = ExtResource( 1 )
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
}
[node name="login" type="Label" parent="Control"]
margin_left = 15.0
margin_top = 82.0
margin_right = 235.0
margin_bottom = 108.0
custom_styles/normal = ExtResource( 3 )
text = "Username"
align = 1
valign = 1
__meta__ = {
"_edit_use_anchors_": true
"_edit_use_anchors_": false
}
[node name="password" type="Label" parent="Control"]
margin_left = 15.0
margin_top = 142.0
margin_right = 235.0
margin_bottom = 168.0
custom_styles/normal = ExtResource( 3 )
text = "Password"
align = 1
valign = 1
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
}
[node name="Start_page_menuo" parent="." instance=ExtResource( 8 )]
margin_right = -1600.0
margin_bottom = -1024.0
[node name="ru" type="Button" parent="."]
anchor_left = 0.971
anchor_top = 0.0390625
anchor_right = 1.0
anchor_bottom = 0.023
margin_left = -44.3201
margin_top = 25.0
margin_right = -55.9998
margin_bottom = 24.16
anchor_bottom = 0.0623438
margin_left = 1550.39
margin_top = 73.1086
margin_right = 1577.39
margin_bottom = 96.1086
custom_styles/hover = ExtResource( 4 )
custom_styles/focus = ExtResource( 3 )
text = "ru"
flat = true
script = ExtResource( 10 )
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
"_edit_use_anchors_": false
}
[node name="eo" type="Button" parent="."]
anchor_left = 0.971
anchor_right = 1.0
anchor_bottom = 0.023
margin_left = -94.3201
margin_top = 25.0
margin_right = -106.0
margin_bottom = 24.16
anchor_right = 0.971
anchor_bottom = 0.0390625
margin_left = 1500.39
margin_top = 73.1086
margin_right = 1529.39
margin_bottom = 96.1086
custom_styles/hover = ExtResource( 4 )
custom_styles/focus = ExtResource( 3 )
text = "eo"
flat = true
script = ExtResource( 12 )
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
"_edit_use_anchors_": false
}
[node name="en" type="Button" parent="."]
anchor_left = 0.971
anchor_top = 0.0390625
anchor_right = 1.0
anchor_bottom = 0.023
margin_left = -144.32
margin_top = 25.0
margin_right = -156.0
margin_bottom = 24.16
anchor_bottom = 0.0623438
margin_left = 1450.39
margin_top = 73.1086
margin_right = 1479.39
margin_bottom = 96.1086
custom_styles/hover = ExtResource( 4 )
custom_styles/focus = ExtResource( 3 )
text = "en"
flat = true
script = ExtResource( 11 )
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": true
}
[node name="ParallaxBackground" type="ParallaxBackground" parent="."]
[node name="ParallaxBackground" type="ParallaxBackground" parent="ParallaxBackground"]
[node name="TextureRect" type="TextureRect" parent="ParallaxBackground/ParallaxBackground"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = -100.0
margin_right = 0.00012207
margin_bottom = 120.0
texture = ExtResource( 6 )
expand = true
__meta__ = {
"_edit_lock_": true,
"_edit_use_anchors_": false
}
blokoj/rajtigo/skriptoj/login_button.gd
Просмотр файла @ 191b7483
......@@ -26,8 +26,8 @@ func login_request_complete(result, response_code, headers, body):
# Если не авторизован, выводим сообщение, которое вернул бэкэнд
if !Global.status:
message = tr("Wrong username or password")
$"/root/auth_menu/Control/message".set_visible(true)
$"/root/auth_menu/Control/message".set_mytext(message)
$"../message".set_visible(true)
$"../message".set_mytext(message)
# Если авторизован
else:
# Сюда сложим куки, которые прислал сервер в заголовках ответа
......@@ -111,8 +111,8 @@ func _pressed():
if Global.server:
pass
else:
var password = $"/root/auth_menu/Control/your_password".text
var login = $"/root/auth_menu/Control/your_login".text
var password = $"../your_password".text
var login = $"../your_login".text
eniri_uzanto(login, password)
......
blokoj/rajtigo/tero.png.import 0 → 100644
Просмотр файла @ 191b7483
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/tero.png-65ce7436ded9714c81cdc988ef32ea1c.stex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://blokoj/rajtigo/tero.png"
dest_files=[ "res://.import/tero.png-65ce7436ded9714c81cdc988ef32ea1c.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0
kerno/fenestroj/tipo_c1.tscn
Просмотр файла @ 191b7483
......@@ -4,6 +4,7 @@
[ext_resource path="res://kerno/fenestroj/tipo_c1.gd" type="Script" id=2]
[node name="tipo_c1" type="Popup"]
visible = true
margin_right = 200.0
margin_bottom = 200.0
rect_min_size = Vector2( 200, 200 )
......
kerno/menuo/menuo.gd
Просмотр файла @ 191b7483
......@@ -178,7 +178,7 @@ func _on_cap_pressed():
$CanvasLayer/UI/cap/cap_real_rect.set_visible(false)
$CanvasLayer/UI/Lbar.color = Color(0, 0.407843, 0.407843, 0.862745)
$CanvasLayer/UI/Lbar2.color = Color(0, 0.407843, 0.407843, 0.862745)
$CanvasLayer/UI/Lbar3.color = Color(0, 0.407843, 0.407843, 0.862745)
$CanvasLayer/UI/Lbar3.self_modulate = Color(0, 0.407843, 0.407843, 0.862745)
$CanvasLayer/UI/real/realLabel.set_visible(false)
$CanvasLayer/UI/com/comLabel.set_visible(false)
$CanvasLayer/UI/cap/capLabel.set_visible(true)
......@@ -214,11 +214,12 @@ func _on_com_pressed():
$CanvasLayer/UI/cap/cap_real_rect.set_visible(false)
$CanvasLayer/UI/Lbar.color = Color(0.333333, 0, 0.066667, 0.862745)
$CanvasLayer/UI/Lbar2.color = Color(0.333333, 0, 0.066667, 0.862745)
$CanvasLayer/UI/Lbar3.color = Color(0.333333, 0, 0.066667, 0.862745)
$CanvasLayer/UI/Lbar3.self_modulate = Color(0.333333, 0, 0.066667, 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.333333, 0, 0.066667, 0.862745)
Global.realeco = 2
reload = true
# при переключении миров закрываем окна ресурсов, объектов, т.к. они расчитаны на конкретный мир
......@@ -248,7 +249,7 @@ func _on_real_pressed():
$CanvasLayer/UI/cap/cap_real_rect.set_visible(true)
$CanvasLayer/UI/Lbar.color = Color(0.4, 0.6, 1, 0.862745)
$CanvasLayer/UI/Lbar2.color = Color(0.4, 0.6, 1, 0.862745)
$CanvasLayer/UI/Lbar3.color = Color(0.4, 0.6, 1, 0.862745)
$CanvasLayer/UI/Lbar3.self_modulate = Color(0.4, 0.6, 1, 0.862745)
$CanvasLayer/UI/real/realLabel.set_visible(true)
$CanvasLayer/UI/com/comLabel.set_visible(false)
$CanvasLayer/UI/cap/capLabel.set_visible(false)
......
kerno/menuo/menuo.tscn
Просмотр файла @ 191b7483
[gd_scene load_steps=41 format=2]
[gd_scene load_steps=42 format=2]
[ext_resource path="res://blokoj/taskoj/scenoj/taskoj.tscn" type="PackedScene" id=1]
[ext_resource path="res://kerno/menuo/menuo.gd" type="Script" id=2]
......@@ -39,6 +39,7 @@
[ext_resource path="res://blokoj/eliro/eliro.tscn" type="PackedScene" id=37]
[ext_resource path="res://kerno/menuo/resursoj/icons/tab3a.png" type="Texture" id=38]
[ext_resource path="res://blokoj/komerco/komerco.tscn" type="PackedScene" id=39]
[ext_resource path="res://kerno/wablono/estonteco/window1.png" type="Texture" id=40]
[sub_resource type="DynamicFont" id=1]
font_data = ExtResource( 4 )
......@@ -46,9 +47,8 @@ font_data = ExtResource( 4 )
[node name="Menuo" type="Control"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_top = 76.0
margin_right = -1024.0
margin_bottom = -524.0
margin_right = -1600.0
margin_bottom = -1024.0
script = ExtResource( 2 )
__meta__ = {
"_edit_ik_": true,
......@@ -74,17 +74,18 @@ __meta__ = {
[node name="UI" type="Control" parent="CanvasLayer"]
anchor_right = 1.0
anchor_bottom = 1.0
margin_right = -1024.0
margin_bottom = -600.0
margin_left = -0.095665
margin_right = -0.0957031
margin_bottom = -2.0
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Lbar" type="ColorRect" parent="CanvasLayer/UI"]
anchor_bottom = 1.0
anchor_bottom = 1.001
margin_top = 64.0
margin_right = 48.0
margin_bottom = 600.0
margin_bottom = -0.0220337
color = Color( 0.4, 0.6, 1, 0.862745 )
__meta__ = {
"_edit_use_anchors_": true
......@@ -99,7 +100,21 @@ __meta__ = {
"_edit_use_anchors_": true
}
[node name="Lbar3" type="ColorRect" parent="CanvasLayer/UI"]
[node name="Lbar3" type="TextureRect" parent="CanvasLayer/UI"]
self_modulate = Color( 0.4, 0.6, 1, 0.862745 )
margin_left = 34.6478
margin_top = 50.5543
margin_right = 47.6478
margin_bottom = 63.5543
texture = ExtResource( 40 )
expand = true
flip_h = true
__meta__ = {
"_edit_use_anchors_": false
}
[node name="Lbar33" type="ColorRect" parent="CanvasLayer/UI"]
visible = false
margin_left = 35.0
margin_top = 51.0
margin_right = 53.4
......@@ -111,10 +126,13 @@ __meta__ = {
}
[node name="romb" type="ColorRect" parent="CanvasLayer/UI"]
margin_left = 36.0
anchor_left = 0.000625
anchor_top = 3.73258e-09
anchor_right = 0.000625
margin_left = 35.5
margin_top = 49.0
margin_right = 55.0
margin_bottom = 68.0
margin_right = 53.5
margin_bottom = 67.0
rect_rotation = -45.0
color = Color( 0.4, 0.6, 1, 0.862745 )
__meta__ = {
......@@ -349,57 +367,57 @@ __meta__ = {
[node name="quick_actions" type="Button" parent="CanvasLayer/UI"]
anchor_left = 1.0
anchor_right = 1.0
margin_left = 774.92
margin_left = -249.08
margin_top = -2.87686
margin_right = 834.92
margin_right = -189.08
margin_bottom = 51.1231
hint_tooltip = "Быстрые действия"
mouse_default_cursor_shape = 2
icon = ExtResource( 25 )
flat = true
__meta__ = {
"_edit_use_anchors_": true,
"_edit_use_anchors_": false,
"_editor_description_": ""
}
[node name="notifications" type="Button" parent="CanvasLayer/UI"]
anchor_left = 1.0
anchor_right = 1.0
margin_left = 723.92
margin_left = -300.08
margin_top = -2.87686
margin_right = 783.92
margin_right = -240.08
margin_bottom = 51.1231
hint_tooltip = "Уведомления"
mouse_default_cursor_shape = 2
icon = ExtResource( 26 )
flat = true
__meta__ = {
"_edit_use_anchors_": true,
"_edit_use_anchors_": false,
"_editor_description_": ""
}
[node name="search" type="Button" parent="CanvasLayer/UI"]
anchor_left = 1.0
anchor_right = 1.0
margin_left = 672.92
margin_left = -351.08
margin_top = -2.87686
margin_right = 732.92
margin_right = -291.08
margin_bottom = 51.1231
hint_tooltip = "Поиск"
mouse_default_cursor_shape = 2
icon = ExtResource( 27 )
flat = true
__meta__ = {
"_edit_use_anchors_": true,
"_edit_use_anchors_": false,
"_editor_description_": ""
}
[node name="user" type="Button" parent="CanvasLayer/UI"]
anchor_left = 1.0
anchor_right = 1.0
margin_left = 825.812
margin_left = -198.188
margin_top = -3.17015
margin_right = 1029.81
margin_right = 5.81201
margin_bottom = 51.8298
hint_tooltip = "Вкладка пользователя"
mouse_default_cursor_shape = 2
......
Поддерживает Markdown
0% или .
You are about to add 0 people to the discussion. Proceed with caution.
Сначала завершите редактирование этого сообщения!
Пожалуйста, зарегистрируйтесь или чтобы прокомментировать