LTCatt 5 ani în urmă
părinte
comite
8bcdb75b1d

+ 1 - 1
data/ltw/functions/state/0/start_game.mcfunction

@@ -2,7 +2,7 @@
 
 # 确认实际玩家
 tag @a remove selected_player
-tag @a[team=playing,sort=random,limit=8,team=!debugging] add selected_player
+tag @a[team=playing,sort=random,limit=8] add selected_player
 
 # 通知队伍
 tellraw @a[team=playing,tag=!selected_player] ["",{"text": ">> ","color": "red","bold": true},{"text": "你没有被选中参与, 将旁观本局游戏!","color": "red"}]

+ 1 - 1
data/mini/functions/diamond/player_intro.mcfunction

@@ -1,6 +1,6 @@
 # 向单个玩家展示小游戏介绍
 tp @s[team=!debugging] 990.34 245.81 5021.73 2043.85 13.77
-tellraw @s ["",{"text":"\n >> 钻石风暴 >>\n\n","color":"gold","bold":true}," 制作铁镐, 挖取钻石, 然后保住自己的小命!\n 但闪闪发光钻石也会暴露你的位置……\n"]
+tellraw @s ["",{"text":"\n >> 钻石风暴 >>\n\n","color":"gold","bold":true}," 制作铁镐, 挖取钻石, 然后保住自己的小命!\n 但闪闪发光的钻石也会暴露你的位置……\n"]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"太阳落山时游戏即会结束, 然后根据物品栏中的钻石数决定排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"死亡会掉落所有物品, 被击杀后立即复活。","color":"gray"}]
 tellraw @s ["",{"text": " <早期测试> ","color":"dark_red","bold": true}, {"text":"此游戏目前尚在早期测试, 可能非常不稳定!","color":"dark_red"}]

+ 1 - 1
data/mini/functions/diamond/tick5.mcfunction

@@ -4,6 +4,6 @@ execute as @a[team=playing] store result score @s diamond run clear @s diamond 0
 effect give @a[scores={diamond=1..}] glowing 2 0 true
 
 # 显示提示
-execute as @a[scores={diamond=1..},tag=!diamond_got] run tellraw @a ["",{"text": ">> ","color":"blue","bold": true},{"selector": "@s","color":"blue"}," 已获得闪闪发光的钻石!"]
+execute as @a[scores={diamond=1..},tag=!diamond_got] run tellraw @a ["",{"text": ">> ","color":"blue","bold": true},{"selector": "@s","color":"blue"}," 获得了闪闪发光的钻石!"]
 execute as @a[scores={diamond=1..},tag=!diamond_got] as @a[distance=1..] run function lib:sounds/hit
 tag @a[scores={diamond=1..},tag=!diamond_got] add diamond_got

+ 30 - 30
data/mini/functions/parkour/game/test_treasure.mcfunction

@@ -1,44 +1,44 @@
 tag @a remove get_treasure
 
-execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure1] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "营地屋顶","color":"gold"}," 的宝藏!"]
-execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure1
+execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,distance=..2] unless entity @a[tag=treasure1] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "营地屋顶","color":"gold"}," 的宝藏!"]
+execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,team=playing,distance=..2] run tag @s add treasure1
 
-execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure2] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠骨骸","color":"gold"}," 的宝藏!"]
-execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure2
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,distance=..2] unless entity @a[tag=treasure2] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠骨骸","color":"gold"}," 的宝藏!"]
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,team=playing,distance=..2] run tag @s add treasure2
 
-execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure3] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "神庙立柱","color":"gold"}," 的宝藏!"]
-execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure3
+execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,distance=..2] unless entity @a[tag=treasure3] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "神庙立柱","color":"gold"}," 的宝藏!"]
+execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,team=playing,distance=..2] run tag @s add treasure3
 
-execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure4] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "下界之门","color":"gold"}," 的宝藏!"]
-execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure4
+execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,distance=..2] unless entity @a[tag=treasure4] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "下界之门","color":"gold"}," 的宝藏!"]
+execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1011.50 19.50 1058.50 as @a[tag=!treasure4,team=playing,distance=..2] run tag @s add treasure4
 
-execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure5] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "落日森林","color":"gold"}," 的宝藏!"]
-execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure5
+execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,distance=..2] unless entity @a[tag=treasure5] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "落日森林","color":"gold"}," 的宝藏!"]
+execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1026.50 18.50 1047.00 as @a[tag=!treasure5,team=playing,distance=..2] run tag @s add treasure5
 
-execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure6] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "地狱之顶","color":"gold"}," 的宝藏!"]
-execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure6
+execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,distance=..2] unless entity @a[tag=treasure6] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "地狱之顶","color":"gold"}," 的宝藏!"]
+execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1004.50 18.50 1043.50 as @a[tag=!treasure6,team=playing,distance=..2] run tag @s add treasure6
 
-execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure7] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "节奏舞厅","color":"gold"}," 的宝藏!"]
-execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure7
+execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,distance=..2] unless entity @a[tag=treasure7] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "节奏舞厅","color":"gold"}," 的宝藏!"]
+execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1013.00 08.50 1041.00 as @a[tag=!treasure7,team=playing,distance=..2] run tag @s add treasure7
 
-execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure8] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "末路营火","color":"gold"}," 的宝藏!"]
-execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure8
+execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,distance=..2] unless entity @a[tag=treasure8] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "末路营火","color":"gold"}," 的宝藏!"]
+execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,team=playing,distance=..2] run tag @s add treasure8
 
-execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure9] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "活塞平台","color":"gold"}," 的宝藏!"]
-execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure9
+execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,distance=..2] unless entity @a[tag=treasure9] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "活塞平台","color":"gold"}," 的宝藏!"]
+execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1024.50 29.50 1038.50 as @a[tag=!treasure9,team=playing,distance=..2] run tag @s add treasure9
 
-execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,gamemode=!spectator,team=!debugging,distance=..2] unless entity @a[tag=treasure10] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠密室","color":"gold"}," 的宝藏!"]
-execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add get_treasure
-execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,gamemode=!spectator,team=!debugging,distance=..2] run tag @s add treasure10
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,distance=..2] unless entity @a[tag=treasure10] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠密室","color":"gold"}," 的宝藏!"]
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,distance=..2] run tag @s add get_treasure
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,team=playing,distance=..2] run tag @s add treasure10
 
 scoreboard players add @a[tag=get_treasure] treasure 1
 tellraw @a[tag=get_treasure,scores={treasure=..9}] ["",{"text":">> ","color":"green","bold": true},"你已获得 ",{"score": {"objective": "treasure","name": "*"},"color":"green"},{"text": " 份 ","color":"green"},"宝藏!"]

+ 1 - 1
data/test/functions/fast_countdown.mcfunction

@@ -1,5 +1,5 @@
 # 测试用:将倒计时修改为立即结束
 
-scoreboard players set #start_sec mem 3
+scoreboard players set #start_countdown mem 3
 scoreboard players set $countdown mem 1
 scoreboard players set $countdown_fast mem 5