Fix 狼人杀

wifi-left · Jan 26, 2025 · 4dfbc67 · 4dfbc67
1 parent 04d0948
commit 4dfbc67
Show file tree

Hide file tree

Showing 118 changed files with 57 additions and 51 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
@@ -8,7 +8,7 @@ body:
     attributes:
       value: |
         提交前请确认：
-        * 该问题确实是 **MiniGames 地图 的错误**，而**不算服务端的问题**。如果实在不确定，也可以直接发 Issue 询问。
+        * 该问题确实是 **wifi-left's MiniGames 地图 的错误**，而**不算服务端的问题**。如果实在不确定，也可以直接发 Issue 询问。
         * 你的地图版本是**最新的版本**。
     
         如果你的问题并不属于上述两类，你可以选取另一种 Issue 类型，或者直接前往官方QQ群进行反馈：958572618

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# MiniGames
+# wifi-left's MiniGames
 如果您想要使用此地图，请遵守：
 1. 请不要删除任何原作者信息
 2. 如果进行修改请添加明显提示

diff --git a/data/JMPlayerSettings.dat b/data/JMPlayerSettings.dat
diff --git a/data/chunks.dat b/data/chunks.dat
diff --git a/data/map_12.dat b/data/map_12.dat
diff --git a/data/map_13.dat b/data/map_13.dat
diff --git a/data/map_17.dat b/data/map_17.dat
diff --git a/data/map_18.dat b/data/map_18.dat
diff --git a/data/map_19.dat b/data/map_19.dat
diff --git a/data/map_20.dat b/data/map_20.dat
diff --git a/data/map_21.dat b/data/map_21.dat
diff --git a/data/map_22.dat b/data/map_22.dat
diff --git a/data/map_23.dat b/data/map_23.dat
diff --git a/data/map_24.dat b/data/map_24.dat
diff --git a/data/map_25.dat b/data/map_25.dat
diff --git a/data/map_26.dat b/data/map_26.dat
diff --git a/data/map_27.dat b/data/map_27.dat
diff --git a/data/map_28.dat b/data/map_28.dat
diff --git a/data/map_29.dat b/data/map_29.dat
diff --git a/data/map_30.dat b/data/map_30.dat
diff --git a/data/map_31.dat b/data/map_31.dat
diff --git a/data/map_32.dat b/data/map_32.dat
diff --git a/data/map_33.dat b/data/map_33.dat
diff --git a/data/map_34.dat b/data/map_34.dat
diff --git a/data/map_35.dat b/data/map_35.dat
diff --git a/data/map_36.dat b/data/map_36.dat
diff --git a/data/map_37.dat b/data/map_37.dat
diff --git a/data/map_38.dat b/data/map_38.dat
diff --git a/data/raids.dat b/data/raids.dat
diff --git a/data/scoreboard.dat b/data/scoreboard.dat
diff --git a/datapacks/map_game_2nd/data/minecraft/function/boat/join.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/boat/join.mcfunction
@@ -7,10 +7,10 @@
 # return 0
 team join boat @s
 title @s reset
-tellraw @a [{"selector":"@s"},"\u00a7a 加入了\u00a79冰船游戏\u00a7a。"]
-title @s title ["\u00a79冰船游戏"]
+tellraw @a [{"selector":"@s"},"\u00a7a 加入了\u00a79竞速游戏\u00a7a。"]
+title @s title ["\u00a79竞速游戏"]
 title @s subtitle ["\u00a7bIce Boat Game"]
-tellraw @s ["\u00a79\u00a7l冰船游戏\n\n\u00a76\u00a7l   Idea from: \u00a7b\u00a7lDomnick_JYH \u00a7a&\u00a7b wifi_left\n"]
+tellraw @s ["\u00a79\u00a7l竞速游戏\n\n\u00a76\u00a7l   Idea from: \u00a7b\u00a7lDomnick_JYH \u00a7a&\u00a7b wifi_left\n"]
 # execute in minecraft:boatworld run tp @s -142 -56 -42 180 0
 execute in minecraft:boatworld2 run tp @s -12 146 -43 0 0
 playsound entity.player.levelup player @s ~ ~ ~ 10 1 1

diff --git a/datapacks/map_game_2nd/data/minecraft/function/boat/over/over.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/boat/over/over.mcfunction
@@ -2,8 +2,8 @@
 ## Datapack Upgrader v1.0.0 by wifi_left
 ## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader
 ## 
-team modify boat prefix ["\u00a7c[O]\u00a79 冰船\u00a78 | "]
-tellraw @a ["\u00a79\u00a7l冰船游戏 ＞ \u00a7a游戏结束。"]
+team modify boat prefix ["\u00a7c[O]\u00a79 竞速\u00a78 | "]
+tellraw @a ["\u00a79\u00a7l竞速游戏 ＞ \u00a7a游戏结束。"]
 forceload add -32 88 -102 313
 function boat/over/listname
 gamemode spectator @a[team=boat,gamemode=!creative]

diff --git a/datapacks/map_game_2nd/data/minecraft/function/boat/over/tp.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/boat/over/tp.mcfunction
@@ -2,7 +2,7 @@
 ## Datapack Upgrader v1.0.0 by wifi_left
 ## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader
 ## 
-team modify boat prefix ["\u00a7a[W]\u00a79 冰船\u00a78 | "]
+team modify boat prefix ["\u00a7a[W]\u00a79 竞速\u00a78 | "]
 
 scoreboard players reset @e[tag=boat]
 kill @e[tag=boat]

diff --git a/datapacks/map_game_2nd/data/minecraft/function/boat/readycount.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/boat/readycount.mcfunction
@@ -4,7 +4,7 @@
 ## 
 scoreboard players remove boat.start board 1
 execute if score boat.start board matches 1.. run tellraw @a[team=boat] ["\u00a7e游戏即将在",{"score":{"name": "boat.start","objective": "board"},"color":"red"},"\u00a7e秒后开始。"]
-execute if score boat.start board matches 1.. run title @a[team=boat] title ["\u00a79\u00a7l冰船游戏 Ice Boat Game"]
+execute if score boat.start board matches 1.. run title @a[team=boat] title ["\u00a79\u00a7l竞速游戏 Ice Boat Game"]
 execute if score boat.start board matches 1.. run title @a[team=boat] subtitle ["\u00a7e游戏即将在",{"score":{"name": "boat.start","objective": "board"},"color":"red"},"\u00a7e秒后开始"]
 execute as @a[team=boat] at @s run playsound minecraft:block.note_block.pling player @s -62 160 -98 5 1 1
 

diff --git a/datapacks/map_game_2nd/data/minecraft/function/boat/start.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/boat/start.mcfunction
@@ -10,12 +10,12 @@ forceload add -32 88 -102 313
 fill -76 141 295 -89 135 294 cobblestone_wall keep
 scoreboard players set boat.state state 2
 execute as @a[team=boat] at @s run playsound minecraft:block.anvil.land player @s ~ ~ ~ 5 2 1
-title @a[team=boat] title ["\u00a79\u00a9\u00a7l 冰船游戏 Ice Boat Game"]
+title @a[team=boat] title ["\u00a79\u00a9\u00a7l 竞速游戏 Ice Boat Game"]
 # execute if score boat.type state matches 1 run
-team modify boat prefix ["\u00a7e[R]\u00a79 冰船\u00a78 | "]
+team modify boat prefix ["\u00a7e[R]\u00a79 竞速\u00a78 | "]
 
 
-execute if score boat.type board matches ..1 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7b冰船"]
+execute if score boat.type board matches ..1 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7b竞速"]
 execute if score boat.type board matches 2 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7d猪"]
 execute if score boat.type board matches 3 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位乘坐上\u00a7c炽足兽"]
 execute if score boat.type board matches 4 run title @a[team=boat] subtitle ["\u00a7a游戏即将开始，请各位准备\u00a76赛跑"]

diff --git a/datapacks/map_game_2nd/data/minecraft/function/boat/startgo.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/boat/startgo.mcfunction
@@ -9,7 +9,7 @@ fill -76 141 295 -89 135 294 air replace cobblestone_wall
 
 execute as @a[team=boat] at @s run playsound minecraft:entity.player.levelup player @s ~ ~ ~ 5 1 1
 execute as @a[team=boat] at @s run playsound minecraft:block.note_block.pling player @s ~ ~ ~ 5 2 1
-team modify boat prefix ["\u00a76[P]\u00a79 冰船\u00a78 | "]
+team modify boat prefix ["\u00a76[P]\u00a79 竞速\u00a78 | "]
 scoreboard players set number boat.rounds 0
 scoreboard players set boat.state state 1
 
diff --git a/datapacks/map_game_2nd/data/minecraft/function/endless_wolf/tips.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/endless_wolf/tips.mcfunction
@@ -0,0 +1,12 @@
+tellraw @s ["\n\u00a7a\u00a7l ※ 无尽狼夜"]
+tellraw @s [""]
+tellraw @s ["\u00a761. \u00a7b游戏开始后，随机玩家成为狼人。"]
+tellraw @s ["\u00a762. \u00a7b只有狼人会拥有武器，普通玩家只能在地图中寻找道具。"]
+tellraw @s ["\u00a763. \u00a7b狼人在落日后会获得一把武器，剑不可放入容器或者丢弃。日出后铁剑会回收。"]
+tellraw @s ["\u00a764. \u00a7b如果有普通玩家击杀了一名玩家，会死亡（无论是谁）"]
+tellraw @s ["\u00a765. \u00a7b玩家击杀死亡后，会进入旁观者模式。"]
+tellraw @s ["\u00a766. \u00a7b狼人击杀人后，物品会回收，并且冷却60秒"]
+tellraw @s ["\u00a767. \u00a7b最后一名活着的玩家获胜。"]
+tellraw @s [""]
+tellraw @s ["\u00a77 - wifi-left's MiniGames"]
+tellraw @s [""]
diff --git a/datapacks/map_game_2nd/data/minecraft/function/twolf/action/per/givepoint.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/twolf/action/per/givepoint.mcfunction
@@ -7,7 +7,7 @@ scoreboard players operation @e[tag=wolf.sel,limit=1] LRS_UUID = @s park.uuid
 tag @e[tag=wolf.sel] add wolf.used
 tag @e[tag=wolf.sel] remove wolf.knight
 tag @s add wolf.sell
-execute as @e[tag=wolf.sel] at @s run summon text_display ~ ~1.8 ~ {billboard:"vertical",Tags:["wolf.nametags"],text:'[{"selector":"@a[tag=wolf.sell]"}]'}
+execute as @e[tag=wolf.sel] at @s run summon text_display ~ ~1.8 ~ {alignment:"center",billboard:"vertical",Tags:["wolf.nametags"],text:'[{"selector":"@a[tag=wolf.sell]"}]'}
 execute as @e[tag=wolf.sel] at @s run summon minecraft:armor_stand ~ ~-0.5 ~ {Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,ShowArms:true,NoBasePlate:true,DisabledSlots:2039583,ArmorItems:[{id:"minecraft:leather_boots",count:1},{id:"minecraft:leather_leggings",count:1},{id:"minecraft:leather_chestplate",count:1},{id:"minecraft:player_head",count:1}],Tags:["wolf.new","wolf.nametags"],Marker:true,Glowing:1b}
 item modify entity @e[tag=wolf.new] armor.head gethead
 tag @s remove wolf.sell

diff --git a/datapacks/map_game_2nd/data/minecraft/function/twolf/action/per/highlight.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/twolf/action/per/highlight.mcfunction
@@ -5,16 +5,22 @@
 tag @s add wolf.sell1
 execute as @e[tag=wolf.used] if score @s LRS_UUID = @a[tag=wolf.sell1,limit=1] park.uuid run tag @s add wolf.selll
 execute as @e[tag=wolf.selll] at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run tag @s add wolf.sell
+# say @e[tag=wolf.selll] @e[tag=wolf.sell]
 scoreboard players set wolf.tmp board 0
-execute as @e[tag=wolf.sell] store result score wolf.tmp board run data get entity @s ArmorItems[2].tag.selcount
+execute as @e[tag=wolf.sell] store result score wolf.tmp board run data get entity @s ArmorItems[2].components."minecraft:custom_data".selcount
 
-execute if score wolf.tmp board matches ..0 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:64659},custom_data={selcount:1}]
+# scoreboard players set wolf.tmp board 0
 
-execute if score wolf.tmp board matches 1 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:15465472},custom_data={selcount:2}]
+execute if score wolf.tmp board matches ..0 as @e[tag=wolf.sell] run data modify entity @s ArmorItems[2] set value {id:"leather_chestplate",components:{"minecraft:dyed_color":{rgb:64659},"minecraft:custom_data":{selcount:1}}}
+# leather_chestplate[dyed_color={rgb:64659},custom_data={selcount:1}]
+execute if score wolf.tmp board matches 1 as @e[tag=wolf.sell] run data modify entity @s ArmorItems[2] set value {id:"leather_chestplate",components:{"minecraft:dyed_color":{rgb:15465472},"minecraft:custom_data":{selcount:2}}}
+# item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:15465472},custom_data={selcount:2}]
 
-execute if score wolf.tmp board matches 2 as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:51964},custom_data={selcount:3}]
+execute if score wolf.tmp board matches 2 as @e[tag=wolf.sell] run data modify entity @s ArmorItems[2] set value {id:"leather_chestplate",components:{"minecraft:dyed_color":{rgb:51964},"minecraft:custom_data":{selcount:3}}}
+# item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:51964},custom_data={selcount:3}]
 
-execute if score wolf.tmp board matches 3.. as @e[tag=wolf.sell] run item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:16515227},custom_data={selcount:4}]
+execute if score wolf.tmp board matches 3.. as @e[tag=wolf.sell] run data modify entity @s ArmorItems[2] set value {id:"leather_chestplate",components:{"minecraft:dyed_color":{rgb:16515227},"minecraft:custom_data":{selcount:4}}}
+# item replace entity @s armor.chest with leather_chestplate[dyed_color={rgb:16515227},custom_data={selcount:4}]
 # execute as @e[tag=wolf.selll] run say 1
 
 # say 1

diff --git a/datapacks/map_game_2nd/data/minecraft/function/twolf/action/per/resethighlight.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/twolf/action/per/resethighlight.mcfunction
@@ -2,4 +2,4 @@
 ## Datapack Upgrader v1.0.0 by wifi_left
 ## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader
 ## 
-execute as @s at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run item replace entity @s armor.chest with leather_chestplate[]
+execute as @s at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run data modify entity @s ArmorItems[2] set value {id:"leather_chestplate",count:1}
diff --git a/datapacks/map_game_2nd/data/minecraft/function/twolf/action/resethighlight.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/twolf/action/resethighlight.mcfunction
@@ -2,4 +2,4 @@
 ## Datapack Upgrader v1.0.0 by wifi_left
 ## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader
 ## 
-execute as @e[tag=wolf.used] at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run item replace entity @s armor.chest with leather_chestplate[]
+execute as @e[tag=wolf.used] at @s as @e[type=armor_stand,limit=1,sort=nearest,distance=0..1] run data modify entity @s ArmorItems[2] set value {id:"leather_chestplate",count:1}
diff --git a/datapacks/map_game_2nd/data/minecraft/function/twolf/control/job/knight/select.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/twolf/control/job/knight/select.mcfunction
@@ -13,14 +13,15 @@ execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 as @a[tag=wolf.
 execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run tellraw @a[tag=wolf.tip] ["\u00a7e\u00a7l骑士与他不分上下，对方是炸弹人。\n骑士和炸弹人都死了。"]
 execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/per/death/knight_died
 execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 as @a[tag=wolf.selected] run function twolf/action/per/death/boom_died
-
+# say next
 execute unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run tellraw @a[tag=wolf.tip] ["\u00a7c\u00a7l骑士输了，对方是好人。"]
 execute unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/per/death/knight_died
 # execute as @a[tag=wolf.selected] run function twolf/action/per/death/died
+# say next#2
 
 # tag @a[tag=wolf.selected] add wolf.protected
 execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 run function twolf/action/special_day_night
 execute if score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/special_day_night
 # function twolf/events/event_over
 execute unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 4 unless score @a[tag=wolf.selected,limit=1] LRS_JOB matches 7 run function twolf/action/special_day_back
-
+# say fin
diff --git a/datapacks/map_game_2nd/data/minecraft/function/twolf/overdetect.mcfunction b/datapacks/map_game_2nd/data/minecraft/function/twolf/overdetect.mcfunction
@@ -15,7 +15,12 @@ execute if score wolf.cupid.type board matches 0..1 unless score twolf.state sta
 execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches ..0 if score wolf.r.good board matches ..0 if score wolf.r.cupids board matches ..0 run function minecraft:twolf/over/bad
 execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches 1.. if score wolf.r.bad board matches ..0 if score wolf.r.cupids board matches ..0 run function minecraft:twolf/over/boom
 execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches ..0 if score wolf.r.good board matches ..0 if score wolf.r.cupids board matches 1.. run function minecraft:twolf/over/cupid
-execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches ..0 if score wolf.r.good board matches ..1 if score wolf.r.bad board matches ..1 if score wolf.r.cupids board matches 1.. run function minecraft:twolf/over/cupid
+
+scoreboard players set wolf.judge.tmp.cupid board 0
+execute if entity @a[tag=wolf.connected,gamemode=adventure,scores={LRS_JOB=4}] run scoreboard players set wolf.judge.tmp.cupid board 1
+
+execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches ..0 if score wolf.r.good board matches ..1 if score wolf.r.bad board matches ..1 if score wolf.judge.tmp.cupid board matches 1 if score wolf.r.cupids board matches 1.. run function minecraft:twolf/over/cupid
+execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if score wolf.mode board matches 2 if score wolf.r.tnt board matches ..0 if score wolf.r.good board matches ..1 if score wolf.r.bad board matches ..0 if score wolf.r.cupids board matches 1.. run function minecraft:twolf/over/cupid
 execute unless score twolf.state state matches 3 if score wolf.cupid.type board matches 2 if entity @a[tag=wolf.connected,scores={LRS_JOB=7}] if score wolf.mode board matches 2 if score wolf.r.good board matches ..0 if score wolf.r.good board matches ..0 unless entity @a[tag=wolf.tip,gamemode=adventure,scores={LRS_JOB=4},tag=!wolf.connected] run function minecraft:twolf/over/cupid
 
 # 屠边

diff --git a/datapacks/map_main/data/minecraft/function/inits/reset_random.mcfunction b/datapacks/map_main/data/minecraft/function/inits/reset_random.mcfunction
@@ -44,9 +44,9 @@ summon marker 0 10 0 {Tags:["random_game","neww"],CustomName:'"\\u00a7c烫手的
 scoreboard players set @e[tag=neww] board 9
 tag @e[tag=neww] remove neww
 # Pool War
-summon marker 0 10 0 {Tags:["random_game","neww"],CustomName:'"\\u00a76高尔夫"'}
-scoreboard players set @e[tag=neww] board 10
-tag @e[tag=neww] remove neww
+# summon marker 0 10 0 {Tags:["random_game","neww"],CustomName:'"\\u00a76高尔夫"'}
+# scoreboard players set @e[tag=neww] board 10
+# tag @e[tag=neww] remove neww
 # TNT Wars
 summon marker 0 10 0 {Tags:["random_game","neww"],CustomName:'"\\u00a7cTNT Wars"'}
 scoreboard players set @e[tag=neww] board 11

diff --git a/datapacks/map_main/data/minecraft/function/lobby/quickplay_lists.mcfunction b/datapacks/map_main/data/minecraft/function/lobby/quickplay_lists.mcfunction
@@ -2,7 +2,7 @@ tellraw @s ["\n\u00a76 ※ 快速加入游戏 ※ \u00a7b游戏ID列表：\n"]
 # \n\u00a7a2 \u00a77- \u00a7bBattle Box\n\u00a7a3 \u00a77- \u00a7b信仰方块\n\u00a7a4 \u00a77- \u00a7b冰船\n\u00a7a5 \u00a77- \u00a7b赛车\n\u00a7a6 \u00a77- \u00a7b色盲大战\n\u00a7a7 \u00a77- \u00a7b星跳水立方\n\u00a7a8 \u00a77- \u00a7b战桥\n\u00a7a9 \u00a77- \u00a7b高尔夫\n\u00a7a10 \u00a77- \u00a7b躲猫猫（道具）\n\u00a7a11 \u00a77- \u00a7b躲猫猫（方块）\n\u00a7a12 \u00a77- \u00a7b烫手的山芋\n\u00a7a13 \u00a77- \u00a7b饥饿游戏\n\u00a7a14 \u00a77- \u00a7b职业战争\n\u00a7a15 \u00a77- \u00a7b密室杀手\n\u00a7a16 \u00a77- \u00a7bLive Longest\n\u00a7a17 \u00a77- \u00a7b关卡跑酷\n\u00a7a18 \u00a77- \u00a7b冬泳怪鸽\n\u00a7a19 \u00a77- \u00a7b棋类游戏\n\u00a7a20 \u00a77- \u00a7b狼人杀\n\u00a7a21 \u00a77- \u00a7b小游戏合集\n\u00a7a22 \u00a77- \u00a7bSnow\n\u00a7a23 \u00a77- \u00a7bTNT Wars\n\u00a7a24 \u00a77- \u00a7bZombie Days（PVE）\n\u00a7a25 \u00a77- \u00a7b生存游戏\n\u00a7a26 \u00a77- \u00a7b起床战争\n
 function minecraft:lobby/quickplay_info {id:2,name:"Battle Box",color:b}
 function minecraft:lobby/quickplay_info {id:3,name:"信仰方块",color:b}
-function minecraft:lobby/quickplay_info {id:4,name:"冰船",color:b}
+function minecraft:lobby/quickplay_info {id:4,name:"竞速",color:b}
 function minecraft:lobby/quickplay_info {id:5,name:"高尔夫",color:b}
 function minecraft:lobby/quickplay_info {id:6,name:"色盲大战",color:b}
 function minecraft:lobby/quickplay_info {id:7,name:"星跳水立方",color:b}

diff --git a/datapacks/map_main/data/minecraft/function/main.mcfunction b/datapacks/map_main/data/minecraft/function/main.mcfunction
@@ -25,7 +25,7 @@ execute as @a[tag=NEWENTER] at @s run tag @s add map.old
 execute as @a[tag=NEWENTER] at @s run function lobby/cleartags
 title @a[tag=NEWENTER] title ["\u00a7a\u00a7lMini\u00a7e\u00a7lGames"]
 title @a[tag=NEWENTER] subtitle ["\u00a76You're in \u00a7dMain Lobby"]
-title @a[tag=NEWENTER] actionbar ["\u00a7aWelcome to the map!"]
+title @a[tag=NEWENTER] actionbar ["\u00a7aMade by wifi-left"]
 tellraw @a[tag=NEWENTER] ["\n\u00a7a  您可以随时使用 \u00a76/trigger hub \u00a7a返回大厅。\n  \u00a7a全局音乐可以通过\u00a76游戏设置 - 声音设置 - 玩家语音\u00a7a调节声音大小\n  \u00a7e部分游戏支持使用 \u00a76/trigger rejoin\u00a7e 重新加入退出的游戏！\n\n\u00a7b  下载资源包：",{"text":"\u00a7d\u00a7n[GitLab](推荐)","underlined": true,"clickEvent": {"action":"open_url","value": "https://gitlab.com/wifi-left/Map-MiniGames/-/raw/master/resourcepack/MiniGameRes.zip"}}," ",{"underlined": true,"text":"\u00a7e\u00a7n[GitHub](备用)","clickEvent": {"action":"open_url","value": "https://github.com/wifi-left/Map-MiniGames/raw/master/resourcepack/MiniGameRes.zip"}},"\n"]
 execute as @a[tag=NEWENTER] run attribute @s max_health base set 20
 

diff --git a/datapacks/zombiepve/data/minecraft/function/zombieever/tasks/find_keys.mcfunction b/datapacks/zombiepve/data/minecraft/function/zombieever/tasks/find_keys.mcfunction
@@ -23,7 +23,7 @@ forceload add 597 -45 714 1
 tellraw @a[team=play.zombie] ["\u00a7e亚奇洛贝：\u00a7f听说，冈里丝戴布先生很喜欢\u00a7e把贵重物品藏在自己的\u00a7d樱花树花园\u00a7e当中\u00a7f。"]
 tellraw @a[team=play.zombie] ["\n\u00a7b收到任务 \u00a7a",{"color":"green","text":"[寻找钥匙]","hoverEvent": {"action": "show_text","contents": [{"text":"\u00a7f寻找打开要塞的钥匙，并顺便打开冈里丝戴布的宅门。\n\n\u00a77温馨提示：存放东西的箱子并不会上锁。"}]}},"\u00a7a\n"]
 
-execute as @e[tag=pve.house.chest] at @s run data merge block ~ ~ ~ {Items:[],lock:{components:{custom_name:'"娃娃的wer114514"'}},CustomName:'"\\u00a7r箱子"'}
+execute as @e[tag=pve.house.chest] at @s run data merge block ~ ~ ~ {Items:[],lock:{items:["minecraft:bedrock"],components:{"minecraft:custom_name":'"娃娃的wer114514"'}},CustomName:'"\\u00a7r箱子"'}
 
 execute as @e[tag=pve.house.chest,limit=1,sort=random] at @s run data merge block ~ ~ ~ {Items:[{id:"minecraft:tripwire_hook",count:1,components:{"minecraft:custom_name":'"\\u00a7e地牢钥匙"',"minecraft:lore":['"\\u00a77用于打开地牢的钥匙"'],"minecraft:custom_data":{lock:2}},Slot:13}],lock:{},CustomName:'"\\u00a77貌似另外一个钥匙藏在樱花花园的角落里？"'}
 

diff --git a/dimensions/minecraft/airworld/data/chunks.dat b/dimensions/minecraft/airworld/data/chunks.dat
diff --git a/dimensions/minecraft/airworld/data/raids.dat b/dimensions/minecraft/airworld/data/raids.dat
diff --git a/dimensions/minecraft/airworld/poi/r.-1.-1.mca b/dimensions/minecraft/airworld/poi/r.-1.-1.mca
diff --git a/dimensions/minecraft/airworld/poi/r.-1.0.mca b/dimensions/minecraft/airworld/poi/r.-1.0.mca
diff --git a/dimensions/minecraft/airworld/region/r.0.-1.mca b/dimensions/minecraft/airworld/region/r.0.-1.mca
diff --git a/dimensions/minecraft/airworld/region/r.0.0.mca b/dimensions/minecraft/airworld/region/r.0.0.mca
diff --git a/dimensions/minecraft/bedwars_backup/data/raids.dat b/dimensions/minecraft/bedwars_backup/data/raids.dat
diff --git a/dimensions/minecraft/boatworld2/data/raids.dat b/dimensions/minecraft/boatworld2/data/raids.dat
diff --git a/dimensions/minecraft/boatworld2/entities/r.-1.0.mca b/dimensions/minecraft/boatworld2/entities/r.-1.0.mca
diff --git a/dimensions/minecraft/boatworld2/poi/r.-1.-1.mca b/dimensions/minecraft/boatworld2/poi/r.-1.-1.mca
diff --git a/dimensions/minecraft/boatworld2/region/r.-1.-1.mca b/dimensions/minecraft/boatworld2/region/r.-1.-1.mca
diff --git a/dimensions/minecraft/boatworld2/region/r.-1.0.mca b/dimensions/minecraft/boatworld2/region/r.-1.0.mca
diff --git a/dimensions/minecraft/boatworld2/region/r.0.-1.mca b/dimensions/minecraft/boatworld2/region/r.0.-1.mca
diff --git a/dimensions/minecraft/boatworld2/region/r.0.0.mca b/dimensions/minecraft/boatworld2/region/r.0.0.mca
diff --git a/dimensions/minecraft/dropperworld/data/raids.dat b/dimensions/minecraft/dropperworld/data/raids.dat
diff --git a/dimensions/minecraft/golfworld/data/raids.dat b/dimensions/minecraft/golfworld/data/raids.dat
diff --git a/dimensions/minecraft/hungerworld/data/raids.dat b/dimensions/minecraft/hungerworld/data/raids.dat
diff --git a/dimensions/minecraft/killerworld/data/raids.dat b/dimensions/minecraft/killerworld/data/raids.dat
diff --git a/dimensions/minecraft/killerworld/entities/r.0.0.mca b/dimensions/minecraft/killerworld/entities/r.0.0.mca
diff --git a/dimensions/minecraft/killerworld/poi/r.0.0.mca b/dimensions/minecraft/killerworld/poi/r.0.0.mca
diff --git a/dimensions/minecraft/killerworld/region/r.-1.-1.mca b/dimensions/minecraft/killerworld/region/r.-1.-1.mca
diff --git a/dimensions/minecraft/killerworld/region/r.-1.0.mca b/dimensions/minecraft/killerworld/region/r.-1.0.mca
diff --git a/dimensions/minecraft/killerworld/region/r.0.-1.mca b/dimensions/minecraft/killerworld/region/r.0.-1.mca
diff --git a/dimensions/minecraft/killerworld/region/r.0.0.mca b/dimensions/minecraft/killerworld/region/r.0.0.mca
diff --git a/dimensions/minecraft/lobby/data/raids.dat b/dimensions/minecraft/lobby/data/raids.dat
diff --git a/dimensions/minecraft/lobby/entities/r.-1.0.mca b/dimensions/minecraft/lobby/entities/r.-1.0.mca
diff --git a/dimensions/minecraft/lobby/entities/r.0.-1.mca b/dimensions/minecraft/lobby/entities/r.0.-1.mca
diff --git a/dimensions/minecraft/lobby/entities/r.0.0.mca b/dimensions/minecraft/lobby/entities/r.0.0.mca
diff --git a/dimensions/minecraft/lobby/poi/r.-1.0.mca b/dimensions/minecraft/lobby/poi/r.-1.0.mca
diff --git a/dimensions/minecraft/lobby/poi/r.0.-1.mca b/dimensions/minecraft/lobby/poi/r.0.-1.mca
diff --git a/dimensions/minecraft/lobby/poi/r.0.0.mca b/dimensions/minecraft/lobby/poi/r.0.0.mca
diff --git a/dimensions/minecraft/lobby/region/r.-1.-1.mca b/dimensions/minecraft/lobby/region/r.-1.-1.mca
diff --git a/dimensions/minecraft/lobby/region/r.-1.0.mca b/dimensions/minecraft/lobby/region/r.-1.0.mca
diff --git a/dimensions/minecraft/lobby/region/r.-1.1.mca b/dimensions/minecraft/lobby/region/r.-1.1.mca
diff --git a/dimensions/minecraft/lobby/region/r.0.-1.mca b/dimensions/minecraft/lobby/region/r.0.-1.mca
diff --git a/dimensions/minecraft/lobby/region/r.0.0.mca b/dimensions/minecraft/lobby/region/r.0.0.mca
diff --git a/dimensions/minecraft/lobby/region/r.0.3.mca b/dimensions/minecraft/lobby/region/r.0.3.mca
diff --git a/dimensions/minecraft/lobby/region/r.1.3.mca b/dimensions/minecraft/lobby/region/r.1.3.mca
diff --git a/dimensions/minecraft/lobby/region/r.2.3.mca b/dimensions/minecraft/lobby/region/r.2.3.mca
diff --git a/dimensions/minecraft/parkourworld/data/raids.dat b/dimensions/minecraft/parkourworld/data/raids.dat
diff --git a/entities/r.-1.-1.mca b/entities/r.-1.-1.mca
diff --git a/entities/r.-1.0.mca b/entities/r.-1.0.mca
diff --git a/entities/r.-1.1.mca b/entities/r.-1.1.mca
diff --git a/entities/r.-2.1.mca b/entities/r.-2.1.mca
diff --git a/entities/r.0.-1.mca b/entities/r.0.-1.mca
diff --git a/entities/r.0.0.mca b/entities/r.0.0.mca
diff --git a/entities/r.1.-1.mca b/entities/r.1.-1.mca
diff --git a/level.dat b/level.dat
diff --git a/poi/r.-1.0.mca b/poi/r.-1.0.mca
diff --git a/poi/r.-1.1.mca b/poi/r.-1.1.mca
diff --git a/poi/r.-1.2.mca b/poi/r.-1.2.mca
diff --git a/poi/r.-2.2.mca b/poi/r.-2.2.mca
diff --git a/poi/r.0.-1.mca b/poi/r.0.-1.mca
diff --git a/poi/r.0.0.mca b/poi/r.0.0.mca
diff --git a/poi/r.1.-1.mca b/poi/r.1.-1.mca
diff --git a/poi/r.1.0.mca b/poi/r.1.0.mca
diff --git a/region/r.-1.-1.mca b/region/r.-1.-1.mca
diff --git a/region/r.-1.0.mca b/region/r.-1.0.mca
diff --git a/region/r.-1.1.mca b/region/r.-1.1.mca
diff --git a/region/r.-1.2.mca b/region/r.-1.2.mca
diff --git a/region/r.-2.0.mca b/region/r.-2.0.mca
diff --git a/region/r.-2.1.mca b/region/r.-2.1.mca
diff --git a/region/r.-2.2.mca b/region/r.-2.2.mca
diff --git a/region/r.0.-1.mca b/region/r.0.-1.mca
diff --git a/region/r.0.0.mca b/region/r.0.0.mca
diff --git a/region/r.0.1.mca b/region/r.0.1.mca
diff --git a/region/r.0.2.mca b/region/r.0.2.mca
diff --git a/region/r.1.-1.mca b/region/r.1.-1.mca
diff --git a/region/r.1.0.mca b/region/r.1.0.mca
diff --git a/todo.md b/todo.md
@@ -24,8 +24,8 @@ execute if score tmp.canset board matches 0 run return 0
 
 也许很久都完成不了哈哈
 
-# 烫手的山芋
-新地图大一点
+# 道具竞速
+IDEA BY 物骨
 
 # 无尽狼夜
 
@@ -37,28 +37,10 @@ execute if score tmp.canset board matches 0 run return 0
 6. 狼人铁剑击杀人后，收回物品在bossbar上显示冷却60秒
 7. 最后一名活着的/最后一名死亡的玩家胜利，以title显示
 
-# 空战
-
-## 战利品表
-残月sama
-
-## 建筑地图协助
-Late_Tea
-
-# 老虎机
-
 # 棋类游戏
 
 **制作优先级：Low**
 
-# Golf
-
-**制作优先级：Low**
-
-咕咕咕~
-
-看情况
-
 # Food Party
 
 **制作优先级：Low**