diff options
Diffstat (limited to 'client/menu')
| -rw-r--r-- | client/menu/communicate/chat/chat_open.gd | 2 | ||||
| -rw-r--r-- | client/menu/ingame.gd | 2 | ||||
| -rw-r--r-- | client/menu/lobby.gd | 2 | ||||
| -rw-r--r-- | client/menu/rating/rating.gd | 2 | ||||
| -rw-r--r-- | client/menu/scene_transition.tscn | 24 |
5 files changed, 16 insertions, 16 deletions
diff --git a/client/menu/communicate/chat/chat_open.gd b/client/menu/communicate/chat/chat_open.gd index af691f39..41d4727e 100644 --- a/client/menu/communicate/chat/chat_open.gd +++ b/client/menu/communicate/chat/chat_open.gd @@ -37,7 +37,7 @@ func _ready() -> void: func _input(event: InputEvent) -> void: if Input.is_action_just_pressed("chat"): if line.text != "": - game.mp.send_chat(game.player_id, line.text) + game.mp.send_chat(game.my_player_id, line.text) exit() super(event) diff --git a/client/menu/ingame.gd b/client/menu/ingame.gd index 85c03ad4..b08ff2ab 100644 --- a/client/menu/ingame.gd +++ b/client/menu/ingame.gd @@ -66,7 +66,7 @@ func _on_quit_pressed(): quit() func _on_lobby_pressed(): - game.mp.send_chat(game.player_id, "/end") + game.mp.send_chat(game.my_player_id, "/end") exit() func _on_leave_pressed(): diff --git a/client/menu/lobby.gd b/client/menu/lobby.gd index 0cdabfdd..4c226936 100644 --- a/client/menu/lobby.gd +++ b/client/menu/lobby.gd @@ -169,7 +169,7 @@ func _on_start_pressed(): for i in range(bot_counts[k]): start_msg += "\ncreate-bot %s" % k - game.mp.send_chat(game.player_id, start_msg) + game.mp.send_chat(game.my_player_id, start_msg) Sound.play_music("stop") # TODO: Game music enter func _on_game_join_state_updated(state: Game.JoinState): diff --git a/client/menu/rating/rating.gd b/client/menu/rating/rating.gd index 83df08fa..17ac9512 100644 --- a/client/menu/rating/rating.gd +++ b/client/menu/rating/rating.gd @@ -63,4 +63,4 @@ func _on_button_timer_timeout() -> void: func _on_scoreboard_pressed() -> void: exit() - game.mp.send_chat(game.player_id, "/scoreboard %s" % Global.last_map_name) + game.mp.send_chat(game.my_player_id, "/scoreboard %s" % Global.last_map_name) diff --git a/client/menu/scene_transition.tscn b/client/menu/scene_transition.tscn index 59956ac6..235830bf 100644 --- a/client/menu/scene_transition.tscn +++ b/client/menu/scene_transition.tscn @@ -3,34 +3,34 @@ [ext_resource type="Script" uid="uid://ciml1u2x4f1ci" path="res://menu/scene_transition.gd" id="1_fpbwj"] [ext_resource type="Shader" uid="uid://bmxrbbw18xq7u" path="res://menu/text_loading_anim.gdshader" id="2_g21ck"] -[sub_resource type="Animation" id="Animation_e6dcd"] -resource_name = "fade" +[sub_resource type="Animation" id="Animation_g21ck"] +length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true tracks/0/path = NodePath("black:color") tracks/0/interp = 1 -tracks/0/loop_wrap = true +tracks/0/loop_wrap = false tracks/0/keys = { -"times": PackedFloat32Array(0, 1), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] +"values": [Color(0, 0, 0, 1)] } -[sub_resource type="Animation" id="Animation_g21ck"] -length = 0.001 +[sub_resource type="Animation" id="Animation_e6dcd"] +resource_name = "fade" tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true tracks/0/path = NodePath("black:color") tracks/0/interp = 1 -tracks/0/loop_wrap = false +tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), +"times": PackedFloat32Array(0, 1), +"transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [Color(0, 0, 0, 1)] +"values": [Color(0, 0, 0, 0), Color(0, 0, 0, 1)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_00tv0"] |