Prechádzať zdrojové kódy

added await checkpoint msg

galo 1 rok pred
rodič
commit
68d42710c6
3 zmenil súbory, kde vykonal 12 pridanie a 4 odobranie
  1. 8 1
      Client.gd
  2. 3 3
      Client.tscn
  3. 1 0
      Server.gd

+ 8 - 1
Client.gd

@@ -31,12 +31,16 @@ remote func tokerequest():
 	rpc_id(1,'tokenreply', tk, username)
 
 remote func on_token_confirmed():
-	$spawnmsg/CenterContainer.visible = true
+	if loadlevel_buffer == 'lobby':
+		$spawnmsg/CenterContainer.visible = true
 
 remote func on_player_state_data(arg):
 	print(arg)
 	$spawnmsg/CenterContainer/VBoxContainer/spawnmsg2.text = str(arg)
 
+remote func on_queue_spawn():
+	$spawnmsg/CenterContainer/VBoxContainer/spawnmsg2.text = 'awaiting checkpoint...'
+
 func spawn_request():
 	rpc_id(1,'spawn_request')
 
@@ -185,7 +189,10 @@ remote func level_up(arg, id):
 	if not has_node("players"): return
 	$players.get_node(str(id)).level_up_anim()
 
+var loadlevel_buffer = 'lobby'
+
 remote func loadlevel(arg):
+	loadlevel_buffer = arg
 	get_parent().get_node('Levelselect').loadlevel(arg, false)
 
 #powerpick

+ 3 - 3
Client.tscn

@@ -101,7 +101,7 @@ margin_right = 402.0
 margin_bottom = 196.0
 
 [node name="spawnmsg" type="Label" parent="spawnmsg/CenterContainer/VBoxContainer"]
-margin_right = 149.0
+margin_right = 164.0
 margin_bottom = 14.0
 text = "press \"space\" to be ready"
 align = 1
@@ -112,8 +112,8 @@ node2 = NodePath("../..")
 
 [node name="spawnmsg2" type="Label" parent="spawnmsg/CenterContainer/VBoxContainer"]
 margin_top = 18.0
-margin_right = 149.0
-margin_bottom = 83.0
+margin_right = 164.0
+margin_bottom = 32.0
 text = "loading list...."
 align = 1
 valign = 1

+ 1 - 0
Server.gd

@@ -54,6 +54,7 @@ remote func tokenreply(token, username):
 			user_state_dict[str(username)] =  ' ...await'
 			usernames_dict[api.get_rpc_sender_id()] =  str(username)
 			rpc_id(0,'on_player_state_data',user_state_dict)
+		rpc_id(api.get_rpc_sender_id(),'on_queue_spawn')
 		rpc_id(api.get_rpc_sender_id(),'on_token_confirmed')
 
 remote func spawn_request():