LTCatt пре 5 година
родитељ
комит
e5848624a1
64 измењених фајлова са 154 додато и 142 уклоњено
  1. 1 1
      data/item/functions/tick2.mcfunction
  2. 14 14
      data/lib/functions/music/refresh.mcfunction
  3. 9 8
      data/ltw/functions/init/all.mcfunction
  4. 2 2
      data/ltw/functions/state/0/player_enter.mcfunction
  5. 3 0
      data/ltw/functions/state/0/sp/set_player_id.mcfunction
  6. 39 0
      data/ltw/functions/state/0/sp/start_game.mcfunction
  7. 15 9
      data/ltw/functions/state/0/tick5.mcfunction
  8. 0 3
      data/old/ltw/functions/state/0/set_player_id.mcfunction
  9. 0 34
      data/old/ltw/functions/state/0/start_game.mcfunction
  10. 1 1
      data/old/ltw/functions/state/3/state_enter.mcfunction
  11. 3 3
      data/old/ltw/functions/state/3/tick2.mcfunction
  12. 1 1
      data/old/ltw/functions/state/4/player_enter.mcfunction
  13. 1 1
      data/old/ltw/functions/state/4/state_enter.mcfunction
  14. 1 1
      data/old/ltw/functions/state/5/state_enter.mcfunction
  15. 1 1
      data/old/ltw/functions/state/6/player_enter.mcfunction
  16. 1 1
      data/old/ltw/functions/state/6/state_enter.mcfunction
  17. 6 6
      data/old/ltw/functions/state/7/player_enter.mcfunction
  18. 1 1
      data/old/ltw/functions/state/7/state_enter.mcfunction
  19. 1 1
      data/old/ltw/functions/state/7/tick2.mcfunction
  20. 1 1
      data/old/mini/functions/ass/player_death.mcfunction
  21. 1 1
      data/old/mini/functions/ass/player_enter.mcfunction
  22. 1 1
      data/old/mini/functions/ass/player_intro.mcfunction
  23. 1 1
      data/old/mini/functions/ass/watcher_limit.mcfunction
  24. 1 1
      data/old/mini/functions/colormatch/game/start_new_round.mcfunction
  25. 1 1
      data/old/mini/functions/colormatch/player_enter.mcfunction
  26. 1 1
      data/old/mini/functions/colormatch/player_intro.mcfunction
  27. 1 1
      data/old/mini/functions/colormatch/watcher_limit.mcfunction
  28. 1 1
      data/old/mini/functions/diamond/game/respawn.mcfunction
  29. 1 1
      data/old/mini/functions/diamond/player_enter.mcfunction
  30. 2 2
      data/old/mini/functions/diamond/player_intro.mcfunction
  31. 1 1
      data/old/mini/functions/diamond/watcher_limit.mcfunction
  32. 3 3
      data/old/mini/functions/hotpm/game/pm_give.mcfunction
  33. 1 1
      data/old/mini/functions/hotpm/player_enter.mcfunction
  34. 1 1
      data/old/mini/functions/hotpm/player_intro.mcfunction
  35. 2 2
      data/old/mini/functions/hotpm/watcher_limit.mcfunction
  36. 1 1
      data/old/mini/functions/main/game_end.mcfunction
  37. 1 1
      data/old/mini/functions/main/player_enter.mcfunction
  38. 1 1
      data/old/mini/functions/parkour/player_enter.mcfunction
  39. 1 1
      data/old/mini/functions/parkour/player_intro.mcfunction
  40. 1 1
      data/old/mini/functions/parkour/watcher_limit.mcfunction
  41. 1 1
      data/old/mini/functions/phantom/player_enter.mcfunction
  42. 1 1
      data/old/mini/functions/phantom/player_failed.mcfunction
  43. 1 1
      data/old/mini/functions/phantom/player_intro.mcfunction
  44. 1 1
      data/old/mini/functions/phantom/watcher_limit.mcfunction
  45. 1 1
      data/old/mini/functions/tntrun/player_enter.mcfunction
  46. 1 1
      data/old/mini/functions/tntrun/player_enter2.mcfunction
  47. 1 1
      data/old/mini/functions/tntrun/player_enter3.mcfunction
  48. 2 2
      data/old/mini/functions/tntrun/player_intro.mcfunction
  49. 1 1
      data/old/mini/functions/tntrun/watcher_limit.mcfunction
  50. 1 1
      data/old/mini/functions/trade/game/respawn.mcfunction
  51. 1 1
      data/old/mini/functions/trade/player_enter.mcfunction
  52. 2 2
      data/old/mini/functions/trade/player_intro.mcfunction
  53. 1 1
      data/old/mini/functions/trade/watcher_limit.mcfunction
  54. 1 1
      data/old/test/functions/generate/mixed.mcfunction
  55. 1 1
      data/old/test/functions/generate/score.mcfunction
  56. 2 2
      data/old/test/functions/mini/ass.mcfunction
  57. 1 1
      data/old/test/functions/mini/colormatch.mcfunction
  58. 2 2
      data/old/test/functions/mini/diamond.mcfunction
  59. 1 1
      data/old/test/functions/mini/hotpm.mcfunction
  60. 1 1
      data/old/test/functions/mini/parkour.mcfunction
  61. 1 1
      data/old/test/functions/mini/phantom.mcfunction
  62. 1 1
      data/old/test/functions/mini/tntrun.mcfunction
  63. 2 2
      data/old/test/functions/mini/trade.mcfunction
  64. 1 1
      data/old/test/functions/start_game.mcfunction

+ 1 - 1
data/item/functions/tick2.mcfunction

@@ -8,7 +8,7 @@ kill @e[type=item,tag=LockTempItem]
 # TODO: 未完成的重构
 # TODO: 未完成的重构
 
 
 ## 检测玩家格子锁定
 ## 检测玩家格子锁定
-#execute if score $state mem matches 1.. as @a[team=!debugging] run function item:disable_slot/check_slot
+#execute if score $state mem matches 1.. as @a[team=!debug] run function item:disable_slot/check_slot
 
 
 ## 检查玩家拾取奖励物品
 ## 检查玩家拾取奖励物品
 #execute as @a if data entity @s Inventory[{"tag":{"bonus_new":1b}}] run function item:bonus_item/call
 #execute as @a if data entity @s Inventory[{"tag":{"bonus_new":1b}}] run function item:bonus_item/call

+ 14 - 14
data/lib/functions/music/refresh.mcfunction

@@ -2,25 +2,25 @@
 stopsound @s music
 stopsound @s music
 
 
 # lobby_1
 # lobby_1
-playsound minecraft:music_disc.wait music @s[scores={music_now=1}] 0 1000000 0 1000000
-scoreboard players set @s[scores={music_now=1}] music_time 231
+playsound minecraft:music_disc.wait music @s[scores={music=1}] 0 1000000 0 1000000
+scoreboard players set @s[scores={music=1}] music_time 231
 # lobby_2
 # lobby_2
-playsound minecraft:music_disc.stal music @s[scores={music_now=2}] 0 1000000 0 1000000
-scoreboard players set @s[scores={music_now=2}] music_time 150
+playsound minecraft:music_disc.stal music @s[scores={music=2}] 0 1000000 0 1000000
+scoreboard players set @s[scores={music=2}] music_time 150
 
 
 # mini_fast
 # mini_fast
-playsound minecraft:music_disc.pigstep music @s[scores={music_now=11}] 0 1000000 0 1000000
-scoreboard players set @s[scores={music_now=11}] music_time 148
+playsound minecraft:music_disc.pigstep music @s[scores={music=11}] 0 1000000 0 1000000
+scoreboard players set @s[scores={music=11}] music_time 148
 # mini_middle
 # mini_middle
-playsound minecraft:music_disc.cat music @s[scores={music_now=12}] 0 1000000 0 1000000
-scoreboard players set @s[scores={music_now=12}] music_time 185
+playsound minecraft:music_disc.cat music @s[scores={music=12}] 0 1000000 0 1000000
+scoreboard players set @s[scores={music=12}] music_time 185
 # mini_slow
 # mini_slow
-playsound minecraft:music_disc.mellohi music @s[scores={music_now=13}] 0 1000000 0 1000000
-scoreboard players set @s[scores={music_now=13}] music_time 96
+playsound minecraft:music_disc.mellohi music @s[scores={music=13}] 0 1000000 0 1000000
+scoreboard players set @s[scores={music=13}] music_time 96
 # mini_secret
 # mini_secret
-playsound minecraft:music_disc.ward music @s[scores={music_now=14}] 0 1000000 0 1000000
-scoreboard players set @s[scores={music_now=14}] music_time 251
+playsound minecraft:music_disc.ward music @s[scores={music=14}] 0 1000000 0 1000000
+scoreboard players set @s[scores={music=14}] music_time 251
 
 
 # rest(切换场景的间隙)
 # rest(切换场景的间隙)
-playsound minecraft:music_disc.mall music @s[scores={music_now=21}] 0 1000000 0 1000000
-scoreboard players set @s[scores={music_now=21}] music_time 197
+playsound minecraft:music_disc.mall music @s[scores={music=21}] 0 1000000 0 1000000
+scoreboard players set @s[scores={music=21}] music_time 197

+ 9 - 8
data/ltw/functions/init/all.mcfunction

@@ -27,8 +27,13 @@ scoreboard objectives remove UUID
 scoreboard objectives add UUID dummy "UUID"
 scoreboard objectives add UUID dummy "UUID"
 scoreboard objectives remove music_time
 scoreboard objectives remove music_time
 scoreboard objectives add music_time dummy "音乐倒计时"
 scoreboard objectives add music_time dummy "音乐倒计时"
-scoreboard objectives remove music_now
-scoreboard objectives add music_now dummy "音乐曲目"
+scoreboard objectives remove music
+scoreboard objectives add music dummy "音乐曲目"
+scoreboard objectives remove player_id
+scoreboard objectives add player_id dummy "玩家编号"
+scoreboard objectives remove game_id
+scoreboard objectives add game_id dummy "游戏局号"
+scoreboard players set $ game_id 0
 # 无需移除的全局记分板
 # 无需移除的全局记分板
 scoreboard objectives add leave_game minecraft.custom:leave_game "离开游戏计数"
 scoreboard objectives add leave_game minecraft.custom:leave_game "离开游戏计数"
 
 
@@ -47,6 +52,7 @@ scoreboard players set #7 mem 7
 scoreboard players set #8 mem 8
 scoreboard players set #8 mem 8
 scoreboard players set #9 mem 9
 scoreboard players set #9 mem 9
 scoreboard players set #10 mem 10
 scoreboard players set #10 mem 10
+scoreboard players set #16 mem 16
 scoreboard players set #64 mem 64
 scoreboard players set #64 mem 64
 scoreboard players set #81 mem 81
 scoreboard players set #81 mem 81
 scoreboard players set #100 mem 100
 scoreboard players set #100 mem 100
@@ -54,6 +60,7 @@ scoreboard players set #100 mem 100
 # ---------------------------------------------
 # ---------------------------------------------
 #  通用的玩家队伍
 #  通用的玩家队伍
 # ---------------------------------------------
 # ---------------------------------------------
+# 若玩家不在以下两个队伍之一,那就代表他是游戏中的玩家
 team add debug "调试者"
 team add debug "调试者"
 team modify debug color dark_gray
 team modify debug color dark_gray
 team add watch "旁观者"
 team add watch "旁观者"
@@ -151,11 +158,6 @@ function ltw:state/0/state_enter
 # scoreboard objectives add total_score_disp dummy "得分"
 # scoreboard objectives add total_score_disp dummy "得分"
 # scoreboard objectives remove effect_floating
 # scoreboard objectives remove effect_floating
 # scoreboard objectives add effect_floating dummy "悬浮计时"
 # scoreboard objectives add effect_floating dummy "悬浮计时"
-# scoreboard objectives remove game_id
-# scoreboard objectives add game_id dummy "游戏编号"
-# scoreboard objectives remove player_id
-# scoreboard objectives add player_id dummy "玩家编号"
-# scoreboard players set $ game_id 0
 
 
 # # 商店系统记分板
 # # 商店系统记分板
 # scoreboard objectives add gold dummy "金粒"
 # scoreboard objectives add gold dummy "金粒"
@@ -192,7 +194,6 @@ function ltw:state/0/state_enter
 # # 进度
 # # 进度
 # advancement revoke @a only lib:damage_dealt
 # advancement revoke @a only lib:damage_dealt
 # advancement revoke @a only lib:damage_taken
 # advancement revoke @a only lib:damage_taken
-# advancement revoke @a only item:container/place
 # advancement revoke @a only item:special/consume_enchanted_apple
 # advancement revoke @a only item:special/consume_enchanted_apple
 # advancement revoke @a only item:special/consume_golden_apple
 # advancement revoke @a only item:special/consume_golden_apple
 
 

+ 2 - 2
data/ltw/functions/state/0/player_enter.mcfunction

@@ -5,9 +5,9 @@ title @s clear
 title @s actionbar ""
 title @s actionbar ""
 
 
 # BGM
 # BGM
-scoreboard players set @s music_now 1
+scoreboard players set @s music 1
 function lib:music/refresh
 function lib:music/refresh
-scoreboard players set @s music_now 2
+scoreboard players set @s music 2
 
 
 # 状态效果
 # 状态效果
 effect clear @s
 effect clear @s

+ 3 - 0
data/ltw/functions/state/0/sp/set_player_id.mcfunction

@@ -0,0 +1,3 @@
+scoreboard players add $player_id mem 1
+scoreboard players operation @a[team=,scores={player_id=0},limit=1,sort=random] player_id = $player_id mem
+execute if entity @a[team=,scores={player_id=0}] run function ltw:state/0/sp/set_player_id

+ 39 - 0
data/ltw/functions/state/0/sp/start_game.mcfunction

@@ -0,0 +1,39 @@
+# 开始游戏
+
+# 停止 BGM
+scoreboard players set @s music 0
+function lib:music/refresh
+
+# 确认实际玩家,给予 selected_player 标签
+tag @a remove status_player
+tag @a[team=hub_play,sort=random,limit=8] add selected_player
+
+# 发送通知
+tellraw @a[team=hub_play,tag=!selected_player] [{"text":" ✖ ","color":"red"}," 很遗憾, 你没有被选中参与, 将会旁观本局游戏!"]
+tellraw @a[team=hub_play,tag=selected_player] [{"text":" ","color":"green"},{"text":"✔","bold":true}," "," 游戏开始!"]
+tellraw @a[team=hub_watch] [{"text":" ❇ ","color":"green"}," 游戏开始, 你将旁观本局游戏!"]
+tellraw @a[team=debug] [{"text":" ❇ ","color":"aqua"}," 你处于 Debug 模式中, 不会受游戏开始影响!"]
+
+# 将玩家分为 debug、watch、无队伍 三种
+team join watch @a[team=!debug,tag=!selected_player]
+team leave @a[team=!debug,team=!watch]
+
+# 初始化轮数
+scoreboard players set $round mem 1
+
+# 初始化游戏与玩家 ID
+scoreboard players add $ game_id 1
+scoreboard players operation @a game_id = $ game_id
+scoreboard players set @a[team=] player_id 0
+scoreboard players set $player_id mem 0
+execute if entity @a[team=,scores={player_id=0}] run function ltw:state/0/sp/set_player_id
+
+# 初始化物品
+clear @a[team=]
+
+# TODO: 未完成的重构
+
+# 初始化分数
+
+# 开始小游戏
+function ltw:state/0/state_enter

+ 15 - 9
data/ltw/functions/state/0/tick5.mcfunction

@@ -14,6 +14,8 @@ function lib:tempo_block/tick5
 execute store result score #ready_count mem if entity @a[team=hub_play]
 execute store result score #ready_count mem if entity @a[team=hub_play]
 execute store result score #total_count mem if entity @a
 execute store result score #total_count mem if entity @a
 
 
+scoreboard players set #ready_count mem 10
+
 # 人数足够,开始倒计时
 # 人数足够,开始倒计时
 execute if score #ready_count mem matches 3.. if score $start_countdown mem matches 999.. run tellraw @a [{"text":" ❇ ","color":"green"}," 游戏即将开始, 请使用第一格的物品确定自己是否参与!"]
 execute if score #ready_count mem matches 3.. if score $start_countdown mem matches 999.. run tellraw @a [{"text":" ❇ ","color":"green"}," 游戏即将开始, 请使用第一格的物品确定自己是否参与!"]
 execute if score #ready_count mem matches 3.. if score $start_countdown mem matches 999.. as @a at @s run function lib:sounds/levelup
 execute if score #ready_count mem matches 3.. if score $start_countdown mem matches 999.. as @a at @s run function lib:sounds/levelup
@@ -24,14 +26,13 @@ execute if score #ready_count mem matches ..2 if score $start_countdown mem matc
 execute if score #ready_count mem matches ..2 if score $start_countdown mem matches ..999 as @a at @s run function lib:sounds/error
 execute if score #ready_count mem matches ..2 if score $start_countdown mem matches ..999 as @a at @s run function lib:sounds/error
 execute if score #ready_count mem matches ..2 if score $start_countdown mem matches ..999 run scoreboard players set $start_countdown mem 9999999
 execute if score #ready_count mem matches ..2 if score $start_countdown mem matches ..999 run scoreboard players set $start_countdown mem 9999999
 
 
-# 20s:提示未准备
-execute if score $start_countdown mem matches 80 run tellraw @a[team=hub_watch] [{"text":" ❇ ","color":"gold"}," 你还没有准备开始! 如果要参加游戏, 请丢出第一格的灰色染料!"]
+# 减少倒计时
+scoreboard players remove $start_countdown mem 1
 
 
-# 10s:提示玩家数量过多
-execute if score $start_countdown mem matches 40 if score #ready_count mem matches 9.. run tellraw @a [{"text":" ❇ ","color":"gold"}," 准备人数已超出 8 人的人数上限, 将随机抽取 8 人进行游戏!"]
+# 15s:提示未准备
+execute if score $start_countdown mem matches 60 run tellraw @a[team=hub_watch] [{"text":" ❇ ","color":"gold"}," 如果要加入游戏, 请丢出第一格的灰色染料, 否则将会进入旁观模式!"]
 
 
 # 10s:播放倒计时音效
 # 10s:播放倒计时音效
-scoreboard players remove $start_countdown mem 1
 scoreboard players operation #start_sec mem = $start_countdown mem
 scoreboard players operation #start_sec mem = $start_countdown mem
 scoreboard players operation #start_sec mem /= #4 mem
 scoreboard players operation #start_sec mem /= #4 mem
 scoreboard players operation #start_div mem = $start_countdown mem
 scoreboard players operation #start_div mem = $start_countdown mem
@@ -39,8 +40,13 @@ scoreboard players operation #start_div mem %= #4 mem
 execute if score #start_sec mem matches 1..10 if score #start_div mem matches 3 run execute as @a at @s run function lib:sounds/hit2
 execute if score #start_sec mem matches 1..10 if score #start_div mem matches 3 run execute as @a at @s run function lib:sounds/hit2
 
 
 # 0s:开始游戏
 # 0s:开始游戏
-execute if score $start_countdown mem matches 0 run function ltw:state/0/start_game
+execute if score $start_countdown mem matches 0 run function ltw:state/0/sp/start_game
 
 
-# 显示信息
-execute if score $start_countdown mem matches 1..999 run title @a[team=!debugging] actionbar [{"text":"","color":"green"},{"score":{"name":"#ready_count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | ","将在 ",{"score":{"name":"#start_sec","objective":"mem"}}," 秒后开始游戏"]
-execute if score $start_countdown mem matches 999.. run title @a[team=!debugging] actionbar [{"text":"","color":"red"},{"score":{"name":"#ready_count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | 需要 3 人以开始游戏"]
+# 显示 ActionBar 信息
+execute if score $start_countdown mem matches 999.. run title @a actionbar [{"text":"","color":"red"},{"score":{"name":"#ready_count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | 需要 3 人以开始游戏"]
+execute if score $start_countdown mem matches 1..998 run title @a actionbar [{"text":"","color":"green"},{"score":{"name":"#ready_count","objective":"mem"}},"/",{"score":{"name":"#total_count","objective":"mem"}}," 人已准备 | 游戏将在 ",{"score":{"name":"#start_sec","objective":"mem"}}," 秒后开始"]
+
+# 替换人数过多的警告
+scoreboard players operation #start_div mem = $start_countdown mem
+scoreboard players operation #start_div mem %= #16 mem
+execute if score $start_countdown mem matches 1..998 if score #start_div mem matches 8.. if score #ready_count mem matches 9.. run title @a actionbar {"text":"人数过多, 将随机抽取 8 人进行游戏","color":"yellow"}

+ 0 - 3
data/old/ltw/functions/state/0/set_player_id.mcfunction

@@ -1,3 +0,0 @@
-scoreboard players add $player_id mem 1
-scoreboard players operation @a[team=playing,scores={player_id=0},limit=1,sort=random] player_id = $player_id mem
-execute if entity @a[team=playing,scores={player_id=0}] run function ltw:state/0/set_player_id

+ 0 - 34
data/old/ltw/functions/state/0/start_game.mcfunction

@@ -1,34 +0,0 @@
-# 开始游戏
-
-# 确认实际玩家
-tag @a remove 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"}]
-team join watching @a[team=playing,tag=!selected_player]
-tellraw @a[team=playing,tag=selected_player] ["",{"text": ">> ","color": "green","bold": true},{"text": "游戏开始!","color": "green"}]
-tellraw @a[team=watching] ["",{"text": ">> ","color": "green","bold": true},{"text": "游戏开始, 你将旁观本局游戏!","color": "green"}]
-tellraw @a[team=debugging] ["",{"text": ">> ","color": "aqua","bold": true},{"text": "你正处于 Debug 模式中, 将忽略游戏开始!","color": "aqua"}]
-
-# 设置数据
-scoreboard players reset * total_score
-scoreboard players set @a[team=playing] total_score 0
-scoreboard players reset * total_score_disp
-scoreboard players set @a[team=playing] total_score_disp 0
-scoreboard players set $round mem 1
-scoreboard players add $ game_id 1
-scoreboard players operation @a game_id = $ game_id
-
-# 分配玩家id
-scoreboard players set @a[team=playing] player_id 0
-scoreboard players set $player_id mem 0
-execute if entity @a[team=playing,scores={player_id=0}] run function ltw:state/0/set_player_id
-
-# 重置物品
-clear @a[team=playing]
-execute as @a[team=playing] at @s run function item:shop/refresh_equip
-
-# 开始小游戏
-function lib:sounds/music/stop
-function ltw:state/3/state_enter

+ 1 - 1
data/old/ltw/functions/state/3/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 3(主要阶段结束,初始化小游戏)
 # 要求系统进入状态 3(主要阶段结束,初始化小游戏)
 scoreboard players set $state mem 3
 scoreboard players set $state mem 3
-execute as @a[team=!debugging] run function ltw:state/3/player_enter
+execute as @a[team=!debug] run function ltw:state/3/player_enter
 
 
 # HUD
 # HUD
 scoreboard objectives setdisplay belowName total_score_disp
 scoreboard objectives setdisplay belowName total_score_disp

+ 3 - 3
data/old/ltw/functions/state/3/tick2.mcfunction

@@ -1,4 +1,4 @@
 # 固定旁观
 # 固定旁观
-gamemode spectator @a[team=!debugging]
-execute as @a[team=!debugging] run spectate
-tp @a[team=!debugging] -22.5 6.5 -9.0 180.0 0.0
+gamemode spectator @a[team=!debug]
+execute as @a[team=!debug] run spectate
+tp @a[team=!debug] -22.5 6.5 -9.0 180.0 0.0

+ 1 - 1
data/old/ltw/functions/state/4/player_enter.mcfunction

@@ -14,5 +14,5 @@ function mini:main/player_intro
 execute at @s run function lib:sounds/travel
 execute at @s run function lib:sounds/travel
 
 
 # 自由旁观
 # 自由旁观
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 spectate
 spectate

+ 1 - 1
data/old/ltw/functions/state/4/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 4(展示小游戏)
 # 要求系统进入状态 4(展示小游戏)
 scoreboard players set $state mem 4
 scoreboard players set $state mem 4
-execute as @a[team=!debugging] run function ltw:state/4/player_enter
+execute as @a[team=!debug] run function ltw:state/4/player_enter
 
 
 # 初始化倒计时
 # 初始化倒计时
 scoreboard players set $countdown mem 10
 scoreboard players set $countdown mem 10

+ 1 - 1
data/old/ltw/functions/state/5/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 5(小游戏进行中)
 # 要求系统进入状态 5(小游戏进行中)
 scoreboard players set $state mem 5
 scoreboard players set $state mem 5
-execute as @a[team=!debugging] run function ltw:state/5/player_enter
+execute as @a[team=!debug] run function ltw:state/5/player_enter
 
 
 # 调用游戏开始
 # 调用游戏开始
 function mini:main/game_start
 function mini:main/game_start

+ 1 - 1
data/old/ltw/functions/state/6/player_enter.mcfunction

@@ -22,7 +22,7 @@ function mini:main/show_result
 execute at @s run function lib:sounds/levelup
 execute at @s run function lib:sounds/levelup
 
 
 # 自由旁观
 # 自由旁观
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 spectate
 spectate
 
 
 # 清理物品
 # 清理物品

+ 1 - 1
data/old/ltw/functions/state/6/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 6(小游戏结束)
 # 要求系统进入状态 6(小游戏结束)
 scoreboard players set $state mem 6
 scoreboard players set $state mem 6
-execute as @a[team=!debugging] run function ltw:state/6/player_enter
+execute as @a[team=!debug] run function ltw:state/6/player_enter
 
 
 # HUD
 # HUD
 scoreboard objectives setdisplay belowName total_score_disp
 scoreboard objectives setdisplay belowName total_score_disp

+ 6 - 6
data/old/ltw/functions/state/7/player_enter.mcfunction

@@ -10,14 +10,14 @@ gamerule naturalRegeneration true
 effect give @s resistance 1000000 4 true
 effect give @s resistance 1000000 4 true
 
 
 # 传送玩家
 # 传送玩家
-tp @s[team=!debugging] 24.5 11.0 1967.5 112.5 25
+tp @s[team=!debug] 24.5 11.0 1967.5 112.5 25
 execute at @s run function lib:sounds/travel
 execute at @s run function lib:sounds/travel
 
 
 # 清除 Tag
 # 清除 Tag
-tag @s[team=watching] remove mini_rank1
-tag @s[team=watching] remove mini_rank2
-tag @s[team=watching] remove mini_rank3
-tag @s[team=watching] remove mini_rank4
+tag @s[team=watch] remove mini_rank1
+tag @s[team=watch] remove mini_rank2
+tag @s[team=watch] remove mini_rank3
+tag @s[team=watch] remove mini_rank4
 tag @s[tag=rejoining] remove mini_rank1
 tag @s[tag=rejoining] remove mini_rank1
 tag @s[tag=rejoining] remove mini_rank2
 tag @s[tag=rejoining] remove mini_rank2
 tag @s[tag=rejoining] remove mini_rank3
 tag @s[tag=rejoining] remove mini_rank3
@@ -25,5 +25,5 @@ tag @s[tag=rejoining] remove mini_rank4
 tag @s remove selecting
 tag @s remove selecting
 
 
 # 自由旁观
 # 自由旁观
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 spectate
 spectate

+ 1 - 1
data/old/ltw/functions/state/7/state_enter.mcfunction

@@ -1,6 +1,6 @@
 # 要求系统进入状态 7(选择奖励)
 # 要求系统进入状态 7(选择奖励)
 scoreboard players set $state mem 7
 scoreboard players set $state mem 7
-execute as @a[team=!debugging] run function ltw:state/7/player_enter
+execute as @a[team=!debug] run function ltw:state/7/player_enter
 
 
 # 世界边界
 # 世界边界
 worldborder set 1000000
 worldborder set 1000000

+ 1 - 1
data/old/ltw/functions/state/7/tick2.mcfunction

@@ -1,6 +1,6 @@
 # 观察者限制
 # 观察者限制
 execute as @a[gamemode=spectator] run spectate
 execute as @a[gamemode=spectator] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=12,y=9,z=1955,dx=24,dy=14,dz=24] run tp @s[team=!debugging] 24.5 12.0 1967.5
+execute as @a[gamemode=spectator] unless entity @s[x=12,y=9,z=1955,dx=24,dy=14,dz=24] run tp @s[team=!debug] 24.5 12.0 1967.5
 
 
 # 清理浮漂
 # 清理浮漂
 kill @e[type=fishing_bobber]
 kill @e[type=fishing_bobber]

+ 1 - 1
data/old/mini/functions/ass/player_death.mcfunction

@@ -3,7 +3,7 @@
 tag @s remove mini_running
 tag @s remove mini_running
 gamemode spectator
 gamemode spectator
 effect give @s night_vision 999999 0 true
 effect give @s night_vision 999999 0 true
-tp @s[team=!debugging] 1032.34 27.11 7032.84 461.44 28.30
+tp @s[team=!debug] 1032.34 27.11 7032.84 461.44 28.30
 # tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
 # tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
 execute as @a at @s run function lib:sounds/error
 execute as @a at @s run function lib:sounds/error
 function mini:main/player_failed
 function mini:main/player_failed

+ 1 - 1
data/old/mini/functions/ass/player_enter.mcfunction

@@ -22,5 +22,5 @@ scoreboard players set @s creeperUse 0
 spreadplayers 1015 7015 1 10 under 15 false @s[team=playing,tag=!rejoining]
 spreadplayers 1015 7015 1 10 under 15 false @s[team=playing,tag=!rejoining]
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode adventure @s[team=playing,tag=!rejoining]
 gamemode adventure @s[team=playing,tag=!rejoining]

+ 1 - 1
data/old/mini/functions/ass/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1010 23 7010 -45 45
+tp @s[team=!debug] 1010 23 7010 -45 45
 effect give @s night_vision 1000000 0 true
 effect give @s night_vision 1000000 0 true
 tellraw @s ["",{"text":"\n >> 核爆刺客 >>\n\n","color":"gold","bold":true}," 在躲避苦力怕的同时,召唤苦力怕炸死对方!\n"]
 tellraw @s ["",{"text":"\n >> 核爆刺客 >>\n\n","color":"gold","bold":true}," 在躲避苦力怕的同时,召唤苦力怕炸死对方!\n"]
 tellraw @s ["",{"text": " <淘汰制> ","color":"red","bold": true}, {"text":"被苦力怕炸死的玩家即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <淘汰制> ","color":"red","bold": true}, {"text":"被苦力怕炸死的玩家即被淘汰。","color":"gray"}]

+ 1 - 1
data/old/mini/functions/ass/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=7001,dx=30,dy=30,dz=30] run spectate
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=7001,dx=30,dy=30,dz=30] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=7001,dx=30,dy=30,dz=30] run tp @s[team=!debugging] 1016 18 7016
+execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=7001,dx=30,dy=30,dz=30] run tp @s[team=!debug] 1016 18 7016

+ 1 - 1
data/old/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -32,4 +32,4 @@ bossbar set mini:red name "地板消失"
 
 
 # 更新地板方块
 # 更新地板方块
 scoreboard players operation $color_match_current mem = $color_match_floor mem
 scoreboard players operation $color_match_current mem = $color_match_floor mem
-execute as @a[team=!debugging] run function mini:colormatch/game/show_floor_block
+execute as @a[team=!debug] run function mini:colormatch/game/show_floor_block

+ 1 - 1
data/old/mini/functions/colormatch/player_enter.mcfunction

@@ -14,7 +14,7 @@ function mini:main/player_max_health
 tp @s[team=playing,tag=!rejoining] 1062 19 4012
 tp @s[team=playing,tag=!rejoining] 1062 19 4012
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode adventure @s[team=playing,tag=!rejoining]
 gamemode adventure @s[team=playing,tag=!rejoining]
 
 
 # 重新加入处理
 # 重新加入处理

+ 1 - 1
data/old/mini/functions/colormatch/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1062.78 22.00 4019.40 178.41 40.03
+tp @s[team=!debug] 1062.78 22.00 4019.40 178.41 40.03
 tellraw @s ["",{"text":"\n >> 色彩迷阵 >>\n\n","color":"gold","bold":true}," 倒计时结束时地板会消失, 站在与墙壁窗口显示的方块相同的地板上才能存活!\n"]
 tellraw @s ["",{"text":"\n >> 色彩迷阵 >>\n\n","color":"gold","bold":true}," 倒计时结束时地板会消失, 站在与墙壁窗口显示的方块相同的地板上才能存活!\n"]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP 干扰> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以造成击退, 但没有伤害。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP 干扰> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以造成击退, 但没有伤害。","color":"gray"}]

+ 1 - 1
data/old/mini/functions/colormatch/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限定范围
 # 观察者限定范围
 execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run spectate
 execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run tp @s[team=!debugging] 1062 22 4012
+execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run tp @s[team=!debug] 1062 22 4012

+ 1 - 1
data/old/mini/functions/diamond/game/respawn.mcfunction

@@ -7,4 +7,4 @@ effect give @s resistance 5 10 true
 
 
 # 传送玩家
 # 传送玩家
 tp @s[team=playing] 1016 280 5016
 tp @s[team=playing] 1016 280 5016
-tp @s[team=watching] 1016 255 5016
+tp @s[team=watch] 1016 255 5016

+ 1 - 1
data/old/mini/functions/diamond/player_enter.mcfunction

@@ -16,7 +16,7 @@ scoreboard players reset @s diamond
 scoreboard players set @s[team=playing,tag=!rejoining] diamond 0
 scoreboard players set @s[team=playing,tag=!rejoining] diamond 0
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode survival @s[team=playing,tag=!rejoining]
 gamemode survival @s[team=playing,tag=!rejoining]
 
 
 # 执行重生方法
 # 执行重生方法

+ 2 - 2
data/old/mini/functions/diamond/player_intro.mcfunction

@@ -1,7 +1,7 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
+tp @s[team=!debug] 1013.47 247.63 5045.62 -178.86 17.18
 worldborder set 1000000
 worldborder set 1000000
-effect give @s[team=!debugging] night_vision 1000000 0 true
+effect give @s[team=!debug] night_vision 1000000 0 true
 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": " <积分制> ","color":"red","bold": true}, {"text":"太阳落山时游戏即会结束, 然后根据持有的钻石数排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"死亡会掉落一半物品, 被击杀后能立即复活。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"死亡会掉落一半物品, 被击杀后能立即复活。","color":"gray"}]

+ 1 - 1
data/old/mini/functions/diamond/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
-tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 5016
+tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debug] 1016 255 5016

+ 3 - 3
data/old/mini/functions/hotpm/game/pm_give.mcfunction

@@ -1,8 +1,8 @@
 # 计算权重
 # 计算权重
 scoreboard players reset @a temp
 scoreboard players reset @a temp
-execute as @a[team=!debugging] run scoreboard players operation @s temp = @s mini_heart
-execute as @a[team=!debugging] run scoreboard players operation @s temp *= #const_100 mem
-execute as @a[team=!debugging] run scoreboard players operation @s temp += @s total_score_disp
+execute as @a[team=!debug] run scoreboard players operation @s temp = @s mini_heart
+execute as @a[team=!debug] run scoreboard players operation @s temp *= #const_100 mem
+execute as @a[team=!debug] run scoreboard players operation @s temp += @s total_score_disp
 scoreboard players add @a[tag=!pm_explode_last] temp 10000
 scoreboard players add @a[tag=!pm_explode_last] temp 10000
 
 
 # 寻找最高分
 # 寻找最高分

+ 1 - 1
data/old/mini/functions/hotpm/player_enter.mcfunction

@@ -21,7 +21,7 @@ tag @s remove pm_explode_last
 tp @s[team=playing,tag=!rejoining] 1018.0 8 3015.0
 tp @s[team=playing,tag=!rejoining] 1018.0 8 3015.0
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode adventure @s[team=playing,tag=!rejoining]
 gamemode adventure @s[team=playing,tag=!rejoining]
 
 
 # 重新加入处理
 # 重新加入处理

+ 1 - 1
data/old/mini/functions/hotpm/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1029 15 3007.77 -290.29 32.65
+tp @s[team=!debug] 1029 15 3007.77 -290.29 32.65
 tellraw @s ["",{"text":"\n >> 炸弹狂魔 >>\n\n","color":"gold","bold":true}, " 在炸弹爆炸前攻击他人, 将炸弹扔到其他人身上!\n"]
 tellraw @s ["",{"text":"\n >> 炸弹狂魔 >>\n\n","color":"gold","bold":true}, " 在炸弹爆炸前攻击他人, 将炸弹扔到其他人身上!\n"]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <生命淘汰制> ","color":"red","bold": true}, {"text":"你有 3 条生命, 生命耗尽后即被淘汰。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以转移炸弹, 远程伤害同样有效。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以转移炸弹, 远程伤害同样有效。","color":"gray"}]

+ 2 - 2
data/old/mini/functions/hotpm/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator,team=!debugging] run spectate
-execute as @a[gamemode=spectator,team=!debugging] unless entity @s[x=1001,y=5,z=3001,dx=29,dy=11,dz=27] run tp @s 1029 15 3007.77 -290.29 32.65
+execute as @a[gamemode=spectator,team=!debug] run spectate
+execute as @a[gamemode=spectator,team=!debug] unless entity @s[x=1001,y=5,z=3001,dx=29,dy=11,dz=27] run tp @s 1029 15 3007.77 -290.29 32.65

+ 1 - 1
data/old/mini/functions/main/game_end.mcfunction

@@ -35,7 +35,7 @@ execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank
 execute if score $mini_type mem matches 4 if score $color_match_time mem matches ..13 run advancement grant @a[tag=mini_rank1] only ltw:parkour/colormatch2
 execute if score $mini_type mem matches 4 if score $color_match_time mem matches ..13 run advancement grant @a[tag=mini_rank1] only ltw:parkour/colormatch2
 
 
 # 清理怪东西
 # 清理怪东西
-clear @a[team=!debugging] #mini:game_item{game_item:1b}
+clear @a[team=!debug] #mini:game_item{game_item:1b}
 
 
 # 进入状态 6
 # 进入状态 6
 function ltw:state/6/state_enter
 function ltw:state/6/state_enter

+ 1 - 1
data/old/mini/functions/main/player_enter.mcfunction

@@ -4,7 +4,7 @@ tag @s remove mini_running
 tag @s[tag=!rejoining,team=playing] add mini_running
 tag @s[tag=!rejoining,team=playing] add mini_running
 scoreboard players set @s mini_score 0
 scoreboard players set @s mini_score 0
 scoreboard players set @s[tag=rejoining] mini_score -1000
 scoreboard players set @s[tag=rejoining] mini_score -1000
-scoreboard players set @s[team=watching] mini_score -1000000
+scoreboard players set @s[team=watch] mini_score -1000000
 function mini:main/update_player_count
 function mini:main/update_player_count
 
 
 clear @s #mini:game_item{game_item:1b}
 clear @s #mini:game_item{game_item:1b}

+ 1 - 1
data/old/mini/functions/parkour/player_enter.mcfunction

@@ -29,7 +29,7 @@ spreadplayers 1018 1007 4 6 under 9 false @s[team=playing,tag=!rejoining]
 # tp @s[team=playing,tag=!rejoining] 1010.07 7.50 1006.98 -1518.69 -10.62
 # tp @s[team=playing,tag=!rejoining] 1010.07 7.50 1006.98 -1518.69 -10.62
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode adventure @s[team=playing,tag=!rejoining]
 gamemode adventure @s[team=playing,tag=!rejoining]
 
 
 # 修改 Tag
 # 修改 Tag

+ 1 - 1
data/old/mini/functions/parkour/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1010.96 26.83 1032.37 -385.24 16.67
+tp @s[team=!debug] 1010.96 26.83 1032.37 -385.24 16.67
 tellraw @s ["",{"text":"\n >> 遗迹寻宝 >>\n\n","color":"gold","bold":true}," 遗迹中共有十处宝藏, 赶在遗迹关闭前尽量收集吧!\n"]
 tellraw @s ["",{"text":"\n >> 遗迹寻宝 >>\n\n","color":"gold","bold":true}," 遗迹中共有十处宝藏, 赶在遗迹关闭前尽量收集吧!\n"]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"根据寻得的宝藏数量进行排名。","color":"gray"}]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"根据寻得的宝藏数量进行排名。","color":"gray"}]
 tellraw @s ["",{"text": " <和平环境> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家。","color":"gray"}]
 tellraw @s ["",{"text": " <和平环境> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家。","color":"gray"}]

+ 1 - 1
data/old/mini/functions/parkour/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run spectate
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run tp @s[team=!debugging] 1027.56 18.03 1046.89 13.48 4.84
+execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run tp @s[team=!debug] 1027.56 18.03 1046.89 13.48 4.84

+ 1 - 1
data/old/mini/functions/phantom/player_enter.mcfunction

@@ -22,7 +22,7 @@ scoreboard players reset @s countdown
 tp @s[team=playing] 1030.5 24.5 6031.5
 tp @s[team=playing] 1030.5 24.5 6031.5
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode adventure @s[team=playing,tag=!rejoining]
 gamemode adventure @s[team=playing,tag=!rejoining]
 
 
 # 重新加入处理
 # 重新加入处理

+ 1 - 1
data/old/mini/functions/phantom/player_failed.mcfunction

@@ -1,7 +1,7 @@
 # 玩家死亡时由玩家自己触发
 # 玩家死亡时由玩家自己触发
 tag @s remove mini_running
 tag @s remove mini_running
 gamemode spectator
 gamemode spectator
-tp @s[team=!debugging] 1062.34 27.11 6040.84 461.44 28.30
+tp @s[team=!debug] 1062.34 27.11 6040.84 461.44 28.30
 # tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
 # tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
 execute as @a at @s run function lib:sounds/error
 execute as @a at @s run function lib:sounds/error
 execute unless entity @a[tag=mini_running] run function mini:main/game_end
 execute unless entity @a[tag=mini_running] run function mini:main/game_end

+ 1 - 1
data/old/mini/functions/phantom/player_intro.mcfunction

@@ -1,5 +1,5 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1062.34 27.11 6040.84 461.44 28.30
+tp @s[team=!debug] 1062.34 27.11 6040.84 461.44 28.30
 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": " <积分制> ","color":"red","bold": true}, {"text":"太阳升起时游戏即会结束, 然后根据击杀数决定排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVE> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家, 但可以杀死幻翼。","color":"gray"}]
 tellraw @s ["",{"text": " <PVE> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家, 但可以杀死幻翼。","color":"gray"}]

+ 1 - 1
data/old/mini/functions/phantom/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] if entity @s[x=1000,y=30,z=6000,distance=100..] run spectate
 execute as @a[gamemode=spectator] if entity @s[x=1000,y=30,z=6000,distance=100..] run spectate
-execute as @a[gamemode=spectator] if entity @s[x=1000,y=30,z=6000,distance=100..] run tp @s[team=!debugging] 1062.34 27.11 6040.84 461.44 28.30
+execute as @a[gamemode=spectator] if entity @s[x=1000,y=30,z=6000,distance=100..] run tp @s[team=!debug] 1062.34 27.11 6040.84 461.44 28.30

+ 1 - 1
data/old/mini/functions/tntrun/player_enter.mcfunction

@@ -21,7 +21,7 @@ tag @s remove tntrun_pc
 # schedule: tag @a add tntrun_pc
 # schedule: tag @a add tntrun_pc
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode adventure @s[team=playing,tag=!rejoining]
 gamemode adventure @s[team=playing,tag=!rejoining]
 
 
 # 重新加入处理
 # 重新加入处理

+ 1 - 1
data/old/mini/functions/tntrun/player_enter2.mcfunction

@@ -1,2 +1,2 @@
 # spreadplayer 后不能立即传送,所以延迟 1tick
 # spreadplayer 后不能立即传送,所以延迟 1tick
-execute as @a[team=playing,tag=!rejoining] at @s run tp @s[team=!debugging] ~ 34.5 ~
+execute as @a[team=playing,tag=!rejoining] at @s run tp @s[team=!debug] ~ 34.5 ~

+ 1 - 1
data/old/mini/functions/tntrun/player_enter3.mcfunction

@@ -1,2 +1,2 @@
 # 让玩家可以触发地板掉落
 # 让玩家可以触发地板掉落
-tag @a[team=!debugging] add tntrun_pc
+tag @a[team=!debug] add tntrun_pc

+ 2 - 2
data/old/mini/functions/tntrun/player_intro.mcfunction

@@ -1,6 +1,6 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1023.65 20.29 2006.59 -345.99 17.34
-effect give @s[team=!debugging] night_vision 1000000 0 true
+tp @s[team=!debug] 1023.65 20.29 2006.59 -345.99 17.34
+effect give @s[team=!debug] night_vision 1000000 0 true
 tellraw @s ["",{"text":"\n >> 地陷圣坛 >>\n\n","color":"gold","bold":true}," 你脚下的方块会不断塌陷! 保持移动, 千万不要停下来啊!\n"]
 tellraw @s ["",{"text":"\n >> 地陷圣坛 >>\n\n","color":"gold","bold":true}," 你脚下的方块会不断塌陷! 保持移动, 千万不要停下来啊!\n"]
 tellraw @s ["",{"text": " <淘汰制> ","color":"red","bold": true}, {"text":"圣坛一共有四层, 掉到最下面即被淘汰。","color":"gray"}]
 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": " <PVP 干扰> ","color":"light_purple","bold": true}, {"text":"攻击其他玩家可以造成击退, 但没有伤害。","color":"gray"}]

+ 1 - 1
data/old/mini/functions/tntrun/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=10,z=2001,dx=37,dy=37,dz=37] run spectate
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=10,z=2001,dx=37,dy=37,dz=37] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=10,z=2001,dx=37,dy=37,dz=37] run tp @s[team=!debugging] 1023.65 20.29 2006.59 -345.99 17.34
+execute as @a[gamemode=spectator] unless entity @s[x=1001,y=10,z=2001,dx=37,dy=37,dz=37] run tp @s[team=!debug] 1023.65 20.29 2006.59 -345.99 17.34

+ 1 - 1
data/old/mini/functions/trade/game/respawn.mcfunction

@@ -7,4 +7,4 @@ effect give @s resistance 5 10 true
 
 
 # 传送玩家
 # 传送玩家
 tp @s[team=playing] 1016 280 5016
 tp @s[team=playing] 1016 280 5016
-tp @s[team=watching] 1016 255 5016
+tp @s[team=watch] 1016 255 5016

+ 1 - 1
data/old/mini/functions/trade/player_enter.mcfunction

@@ -15,7 +15,7 @@ scoreboard players reset * emerald
 scoreboard players set @s[team=playing,tag=!rejoining] emerald 0
 scoreboard players set @s[team=playing,tag=!rejoining] emerald 0
 
 
 # 调整模式
 # 调整模式
-gamemode spectator @s[team=!debugging]
+gamemode spectator @s[team=!debug]
 gamemode survival @s[team=playing,tag=!rejoining]
 gamemode survival @s[team=playing,tag=!rejoining]
 
 
 # 执行重生方法
 # 执行重生方法

+ 2 - 2
data/old/mini/functions/trade/player_intro.mcfunction

@@ -1,7 +1,7 @@
 # 向单个玩家展示小游戏介绍
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
+tp @s[team=!debug] 1013.47 247.63 5045.62 -178.86 17.18
 worldborder set 1000000
 worldborder set 1000000
-effect give @s[team=!debugging] night_vision 1000000 0 true
+effect give @s[team=!debug] night_vision 1000000 0 true
 tellraw @s ["",{"text":"\n >> 贸易专家 >>\n\n","color":"gold","bold":true}," 手持交易契约唤出村民, 与村民交易, 尽快获取绿宝石!\n 每项交易都可以进行 2 次, 进行交易可以增加经验值, 解锁更多交易!\n"]
 tellraw @s ["",{"text":"\n >> 贸易专家 >>\n\n","color":"gold","bold":true}," 手持交易契约唤出村民, 与村民交易, 尽快获取绿宝石!\n 每项交易都可以进行 2 次, 进行交易可以增加经验值, 解锁更多交易!\n"]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"太阳落山时游戏即会结束, 然后根据持有的绿宝石数排名。","color":"gray"}]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"太阳落山时游戏即会结束, 然后根据持有的绿宝石数排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVE> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家, 死亡不掉落且能立即复活。","color":"gray"}]
 tellraw @s ["",{"text": " <PVE> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家, 死亡不掉落且能立即复活。","color":"gray"}]

+ 1 - 1
data/old/mini/functions/trade/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
-tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 5016
+tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debug] 1016 255 5016

+ 1 - 1
data/old/test/functions/generate/mixed.mcfunction

@@ -1,7 +1,7 @@
 # 生成混合奖励
 # 生成混合奖励
 
 
 # 传送
 # 传送
-tp @a[team=!debugging] 24.5 11.0 1967.5
+tp @a[team=!debug] 24.5 11.0 1967.5
 
 
 # 设置轮数
 # 设置轮数
 scoreboard players set $round mem 1
 scoreboard players set $round mem 1

+ 1 - 1
data/old/test/functions/generate/score.mcfunction

@@ -1,7 +1,7 @@
 # 生成分数奖励
 # 生成分数奖励
 
 
 # 传送
 # 传送
-tp @a[team=!debugging] 24.5 11.0 1967.5
+tp @a[team=!debug] 24.5 11.0 1967.5
 
 
 # 设置轮数
 # 设置轮数
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5

+ 2 - 2
data/old/test/functions/mini/ass.mcfunction

@@ -1,6 +1,6 @@
 # 测试用:快速开始 Assassinate
 # 测试用:快速开始 Assassinate
-team join playing @a[team=watching]
-clear @a[team=!debugging]
+team join playing @a[team=watch]
+clear @a[team=!debug]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 201
 scoreboard players set $mini_type mem 201

+ 1 - 1
data/old/test/functions/mini/colormatch.mcfunction

@@ -1,5 +1,5 @@
 # 测试用:快速开始 Color Match
 # 测试用:快速开始 Color Match
-team join playing @a[team=watching]
+team join playing @a[team=watch]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 4
 scoreboard players set $mini_type mem 4

+ 2 - 2
data/old/test/functions/mini/diamond.mcfunction

@@ -1,6 +1,6 @@
 # 测试用:快速开始钻石风暴
 # 测试用:快速开始钻石风暴
-team join playing @a[team=watching]
-clear @a[team=!debugging]
+team join playing @a[team=watch]
+clear @a[team=!debug]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 101
 scoreboard players set $mini_type mem 101

+ 1 - 1
data/old/test/functions/mini/hotpm.mcfunction

@@ -1,5 +1,5 @@
 # 测试用:快速开始 Hot Potato
 # 测试用:快速开始 Hot Potato
-team join playing @a[team=watching]
+team join playing @a[team=watch]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 3
 scoreboard players set $mini_type mem 3

+ 1 - 1
data/old/test/functions/mini/parkour.mcfunction

@@ -1,5 +1,5 @@
 # 测试用:快速开始跑酷
 # 测试用:快速开始跑酷
-team join playing @a[team=watching]
+team join playing @a[team=watch]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 1
 scoreboard players set $mini_type mem 1

+ 1 - 1
data/old/test/functions/mini/phantom.mcfunction

@@ -1,5 +1,5 @@
 # 测试用:快速开始幻翼
 # 测试用:快速开始幻翼
-team join playing @a[team=watching]
+team join playing @a[team=watch]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 5
 scoreboard players set $mini_type mem 5

+ 1 - 1
data/old/test/functions/mini/tntrun.mcfunction

@@ -1,5 +1,5 @@
 # 测试用:快速开始 TNT Run
 # 测试用:快速开始 TNT Run
-team join playing @a[team=watching]
+team join playing @a[team=watch]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 2
 scoreboard players set $mini_type mem 2

+ 2 - 2
data/old/test/functions/mini/trade.mcfunction

@@ -1,6 +1,6 @@
 # 测试用:快速开始不是钻石风暴
 # 测试用:快速开始不是钻石风暴
-team join playing @a[team=watching]
-clear @a[team=!debugging]
+team join playing @a[team=watch]
+clear @a[team=!debug]
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 scoreboard players set $round mem 5
 scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 102
 scoreboard players set $mini_type mem 102

+ 1 - 1
data/old/test/functions/start_game.mcfunction

@@ -1,5 +1,5 @@
 # 强制让所有非调试者开始正常游戏
 # 强制让所有非调试者开始正常游戏
-execute as @a[team=!debugging] run function ltw:state/0/state/join_game
+execute as @a[team=!debug] run function ltw:state/0/state/join_game
 function ltw:state/0/start_game
 function ltw:state/0/start_game
 
 
 tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "管理员已强制开始游戏!","color": "aqua"}]
 tellraw @a ["",{"text": ">> ","color": "aqua","bold": true}, {"text": "管理员已强制开始游戏!","color": "aqua"}]