Browse Source

browselist half way done

galo 1 year ago
parent
commit
9c7fedf101
5 changed files with 44 additions and 16 deletions
  1. 3 1
      BrowseColumn.gd
  2. 10 2
      BrowserListClient.gd
  3. 2 2
      Client.gd
  4. 22 6
      Login.gd
  5. 7 5
      main.tscn

+ 3 - 1
BrowseColumn.gd

@@ -1,6 +1,7 @@
 extends Control
 
 export var clickable = true
+signal click(arg)
 
 func _ready():
 	$Button.connect('button_down',self,'_on_Button_button_down')
@@ -10,5 +11,6 @@ func _on_Button_button_down():
 		var dict = {}
 		for x in $HBoxContainer.get_children():
 			dict[x.name] = x.text
-		print(dict)
+#		print(dict)
+		emit_signal("click",dict)
 	pass # Replace with function body.

+ 10 - 2
BrowserListClient.gd

@@ -2,10 +2,10 @@ extends Node
 
 var browsecolumn = preload('res://BrowseColumn.tscn')
 var dict = {
-	'127.0.0.1:8080': {
+	'127.0.0.1:8081': {
 		'Name':'test',
 		'IP':'127.0.0.1',
-		'Port':8080,
+		'Port':8081,
 		'Ping':125,
 		'Gamemode':'deathmatch',
 		'Map':'de_dus2'
@@ -18,5 +18,13 @@ func _ready():
 		for z in dict[x].keys():
 			print(z)
 			newone.get_node('HBoxContainer').get_node(z).text = str(dict[x][z])
+		newone.connect("click",self,'_on_BrowseColumn_click')
 		$PanelContainer/Table.add_child(newone)
 	pass # Replace with function body.
+
+signal click
+
+func _on_BrowseColumn_click(arg):
+	print('click1')
+	emit_signal("click",arg)
+	pass # Replace with function body.

+ 2 - 2
Client.gd

@@ -2,8 +2,8 @@ extends Node
 
 var net = NetworkedMultiplayerENet.new()
 var api = MultiplayerAPI.new()
-var port = 2020
-var ip = '104.156.250.247'
+var port = 0
+var ip = ''
 # Called when the node enters the scene tree for the first time.
 func _ready():
 	print('connecting to port: ' + str(port))

+ 22 - 6
Login.gd

@@ -4,26 +4,30 @@ var client = preload('res://Client.tscn')
 var server = preload('res://Server.tscn')
 var auth = preload('res://Auth.tscn')
 signal login_confimed
+signal choose_a_server(arg)
 var login_await = true
 
 
 func _ready():
 	for i in get_children():
 		i.hide()
-#	$directconnect.show()
+	$directconnect.show()
 
 func _on_Button_button_down():
 	$directconnect.hide()
 	$loginscreen.show()
 	get_parent().get_node("Loginetcode").ip = $directconnect/VBoxContainer/HBoxContainer/LineEdit2.get_text()
-	get_parent().get_node("Loginetcode")._connect()
+#	get_parent().get_node("Loginetcode")._connect()
 	if login_await: yield(self,'login_confimed')
 	$loginscreen.hide()
+	get_parent().get_node("BrowserListClient/PanelContainer").show()
+	var arg = yield(self,'choose_a_server')
+	get_parent().get_node("BrowserListClient/PanelContainer").hide()
 	var client2 = client.instance()
 	var ip = $directconnect/VBoxContainer/HBoxContainer/LineEdit2.get_text()
 	var port = $directconnect/VBoxContainer/HBoxContainer/LineEdit.get_text()
-	client2.ip = ip
-	client2.port = int(port)
+	client2.ip = arg.IP
+	client2.port = int(arg.Port)
 	get_parent().add_child(client2)
 	pass # Replace with function body.
 
@@ -64,6 +68,9 @@ func _on_Register2_button_down():
 	get_parent().get_node("Loginetcode").Register(username, password, password2, email, salt)
 	password = null
 
+var ip =''
+var port =''
+
 func _on_login_button_down():
 	var username = $loginscreen/VBoxContainer/HBoxContainer/LineEdit2.get_text()
 	get_parent().get_node("Loginetcode").Request_Salt(username)
@@ -79,10 +86,19 @@ func _on_login_button_down():
 	yield(get_parent().get_node("Loginetcode"),'login_confirmed')
 	$loginscreen.hide()
 	var client2 = client.instance()
-	var ip = $directconnect/VBoxContainer/HBoxContainer/LineEdit2.get_text()
-	var port = $directconnect/VBoxContainer/HBoxContainer/LineEdit.get_text()
+#	var ip = $directconnect/VBoxContainer/HBoxContainer/LineEdit2.get_text()
+#	var port = $directconnect/VBoxContainer/HBoxContainer/LineEdit.get_text()
 	client2.ip = ip
 	client2.port = int(port)
 	get_parent().add_child(client2)
 	pass # Replace with function body.
 
+func choose_a_server(arg):
+	print('choose server')
+	print(arg)
+	ip = arg.IP
+	port = arg.Port
+	print(ip)
+	print(port)
+	emit_signal("choose_a_server", arg)
+	pass # Replace with function body.

+ 7 - 5
main.tscn

@@ -48,7 +48,6 @@ render_target_v_flip = true
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin1"]
 modulate = Color( 0, 0.811765, 1, 1 )
 frames = SubResource( 5 )
-frame = 3
 playing = true
 offset = Vector2( 32, 32 )
 
@@ -60,7 +59,7 @@ render_target_v_flip = true
 
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin2"]
 frames = SubResource( 5 )
-frame = 2
+frame = 3
 speed_scale = 0.8
 playing = true
 offset = Vector2( 32, 32 )
@@ -74,7 +73,7 @@ render_target_v_flip = true
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin3"]
 modulate = Color( 1, 0, 0, 1 )
 frames = SubResource( 5 )
-frame = 3
+frame = 1
 speed_scale = 1.2
 playing = true
 offset = Vector2( 32, 32 )
@@ -88,7 +87,7 @@ render_target_v_flip = true
 [node name="Goblin" type="AnimatedSprite" parent="Textures/Goblin4"]
 modulate = Color( 1, 0, 0.984314, 1 )
 frames = SubResource( 5 )
-frame = 2
+frame = 1
 speed_scale = 0.9
 playing = true
 offset = Vector2( 32, 32 )
@@ -346,6 +345,7 @@ script = ExtResource( 4 )
 script = ExtResource( 5 )
 
 [node name="PanelContainer" type="PanelContainer" parent="BrowserListClient"]
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 margin_left = 64.0
@@ -362,7 +362,7 @@ margin_bottom = 281.0
 [node name="BrowseColumn" parent="BrowserListClient/PanelContainer/Table" instance=ExtResource( 7 )]
 anchor_right = 0.0
 margin_right = 498.0
-margin_bottom = 20.0
+margin_bottom = 34.0
 clickable = false
 
 [connection signal="button_down" from="LoginUI/directconnect/VBoxContainer/Button" to="LoginUI" method="_on_Button_button_down"]
@@ -373,3 +373,5 @@ clickable = false
 [connection signal="button_down" from="LoginUI/loginscreen/VBoxContainer/HBoxContainer3/register" to="LoginUI" method="_on_register_button_down"]
 [connection signal="button_down" from="LoginUI/register/VBoxContainer/HBoxContainer6/login2" to="LoginUI" method="_on_login2_button_down"]
 [connection signal="button_down" from="LoginUI/register/VBoxContainer/HBoxContainer6/Register2" to="LoginUI" method="_on_Register2_button_down"]
+[connection signal="click" from="BrowserListClient" to="LoginUI" method="choose_a_server"]
+[connection signal="click" from="BrowserListClient/PanelContainer/Table/BrowseColumn" to="BrowserListClient" method="_on_BrowseColumn_click"]