*

data/item/functions/lobby_state/join_game.mcfunction

@@ -2,7 +2,7 @@
 clear @s gray_dye{lobby_item:1b,lobby_watch:1b}
 kill @e[type=item,nbt={Item:{id:"minecraft:gray_dye",tag:{lobby_item:1b,lobby_watch:1b}}}]
 execute if data entity @s Inventory[{Slot:8b}] unless data entity @s Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_watch:1b}}] at @s run function item:disable_slot/disable_slot_8
-replaceitem entity @s hotbar.8 lime_dye{lobby_item:1b,lobby_ready:1b,display:{Name:'{"text":"已准备(Q切换)","color":"white","bold":true,"italic":false}',Lore:['{"text":"你下一局将参与比赛(如果人数超过8人有概率无法参加)","color":"green","bold":true,"italic":false}']}}
+replaceitem entity @s hotbar.8 lime_dye{lobby_item:1b,lobby_ready:1b,display:{Name:'{"text":"已准备 (按 Q 切换)","color":"green","italic":false}',Lore:['{"text":"你将在下一局参与游戏","color":"green","bold":true,"italic":false}']}}
 
 # 处理数据
 tag @s remove lobby_watch

data/item/functions/lobby_state/join_watch.mcfunction

@@ -2,7 +2,7 @@
 clear @s lime_dye{lobby_item:1b,lobby_ready:1b}
 kill @e[type=item,nbt={Item:{id:"minecraft:lime_dye",tag:{lobby_item:1b,lobby_ready:1b}}}]
 execute if data entity @s Inventory[{Slot:8b}] unless data entity @s Inventory[{Slot:8b,tag:{lobby_item:1b,lobby_ready:1b}}] at @s run function item:disable_slot/disable_slot_8
-replaceitem entity @s hotbar.8 gray_dye{lobby_item:1b,lobby_watch:1b,display:{Name:'{"text":"未准备(Q切换)","color":"white","bold":true,"italic":false}',Lore:['{"text":"你下一局将旁观比赛","color":"gray","bold":true,"italic":false}']}}
+replaceitem entity @s hotbar.8 gray_dye{lobby_item:1b,lobby_watch:1b,display:{Name:'{"text":"旁观 (按 Q 切换)","color":"white","bold":true,"italic":false}',Lore:['{"text":"你将在下一局旁观游戏","color":"gray","italic":false}']}}
 
 # 处理数据
 tag @s remove lobby_ready

data/ltw/functions/state/0/player_enter.mcfunction

@@ -28,9 +28,7 @@ tp @s[tag=!debug] -10 8 -42 68 -20
 
 # 返还金粒
 scoreboard players operation @s[tag=!gold_return] gold = @s gold_total
-tellraw @s[tag=!gold_return] ["",{"text":">> ","color":"aqua","bold": true},{"text":"由于商店更新, 你的已有购买已重置, 花费的金粒已返还!","color":"aqua"}]
-tellraw @s[tag=!gold_return] ["",{"text":">> ","color":"aqua","bold": true},{"text":"由于商店更新, 你的已有购买已重置, 花费的金粒已返还!","color":"aqua"}]
-tellraw @s[tag=!gold_return] ["",{"text":">> ","color":"aqua","bold": true},{"text":"由于商店更新, 你的已有购买已重置, 花费的金粒已返还!","color":"aqua"}]
+tellraw @s[tag=!gold_return,scores={gold=1..}] ["",{"text":">> ","color":"aqua","bold": true},{"text":"由于商店更新, 你的已有购买已重置, 花费的金粒已返还!","color":"aqua"}]
 tag @s add gold_return
 
 # 刷新物品

data/ltw/functions/state/0/try_start_game.mcfunction

@@ -6,6 +6,6 @@ execute if score $game_type mem matches 0 run function ltw:state/0/try_start_cla
 execute if score $game_type mem matches 1 run function ltw:state/0/try_start_gameparty
 
 # 进行提示
-execute if score $countdown mem matches 999 run tellraw @a [{"text":"","color":"green"},{"text": ">> ","bold": true},"游戏即将开始, 请到准备区域准备, 若想旁观则请离开准备区域!"]
+execute if score $countdown mem matches 999 run tellraw @a [{"text":"","color":"green"},{"text": ">> ","bold": true},"游戏即将开始, 请使用快捷栏最后一格确定自己是否参与!"]
 execute if score $countdown mem matches 999 as @a at @s run function lib:sounds/levelup
 execute if score $countdown mem matches 999 run scoreboard players set $countdown mem 21

data/ltw/functions/state/0/try_start_gameparty.mcfunction

@@ -5,11 +5,11 @@ execute store result score $count mem if entity @a[tag=lobby_ready]
 
 # 判断玩家数量过少
 execute if score $count mem matches ..2 as @a at @s run function lib:sounds/error
-execute if score $count mem matches ..2 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "需要至少 3 人以开始游戏, 当前人数不足!","color":"red"}]
+execute if score $count mem matches ..2 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},"需要至少 3 人准备以开始游戏, 当前仅有 ",{"score": {"name": "$count","objective": "mem"}},{"text": " 人","color":"red"}]
 execute if score $count mem matches ..2 run scoreboard players set $countdown mem 0
 
 # 提示未准备
-execute if score $countdown mem matches 10 run tellraw @a[tag=!lobby_ready] [{"text":"","color":"red"},{"text":">> ","bold": true},"你现在还没有准备, 请站在蓝色准备区域以加入游戏!"]
+execute if score $countdown mem matches 10 run tellraw @a[tag=!lobby_ready] [{"text":"","color":"red"},{"text":">> ","bold": true},"你现在还没有准备, 可以丢出快捷栏最后一格的物品准备!"]
 
 # 判断玩家数量过多
 execute if score $count mem matches 9.. if score $countdown mem matches 15 run tellraw @a [{"text":"","color":"gold"},{"text":">> ","bold": true},"游戏最多支持 8 人, 当前已有 ",{"score": { "name": "$count","objective": "mem"}}, " 人, 将随机抽取 8 人开始游戏!"]