一些修改

Author: wifi-left

data/command_storage_minecraft.dat

@@ -4,6 +4,6 @@
 ## 
 kill @e[type=armor_stand,tag=battle.ranpotion]
 summon armor_stand 157 36 -340 {Tags:["battle.ranpotion"],CustomName:["药水"],CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,NoBasePlate:true,DisabledSlots:2039583}
-summon armor_stand 131 36 -340 {Tags:["battle.ranpotion"],CustomName:["药水"],CustomNameVisible:1b,Invulnerable:1b,NoAI:1b,Silent:1b,NoGravity:1b,Invisible:true,NoBasePlate:true,DisabledSlots:2039583}
+summon armor_stand 131 36 -340 {Tags:["battle.ranpotion"],CustomName:["药水"],CustomNameVisible:1b,Invulnerable:1b,Silent:1b,NoGravity:1b,Invisible:true,NoBasePlate:true,DisabledSlots:2039583}
 execute as @e[tag=battle.ranpotion] at @s run function battle/entitygetranpotion
 

data/raids.dat

@@ -0,0 +1,16 @@
+playsound ui.button.click player @s ~ ~ ~ 1 1 1
+## 检测是否禁止设置
+scoreboard players set tmp.canset board 0
+execute store result score tmp.canset board run function admin/setting/canset
+execute if score tmp.canset board matches 0 run tellraw @s ["§c游戏仅管理员可以设定游戏选项。\n§7如果您是管理员，您可以在大厅设置中切换模式。"]
+execute if score tmp.canset board matches 0 run playsound block.anvil.land player @s ~ ~ ~ 1 1 0
+execute if score tmp.canset board matches 0 run return 0
+
+scoreboard players add build_parkour.time state 1
+execute if score build_parkour.time state matches 5.. run scoreboard players set build_parkour.time state 0
+
+execute if score build_parkour.time state matches 0 run data modify block ~ ~ ~ front_text.messages[2] set value {text:"[ 自动 ]",color:white}
+execute if score build_parkour.time state matches 1 run data modify block ~ ~ ~ front_text.messages[2] set value {text:"[ 1min ]",color:green}
+execute if score build_parkour.time state matches 2 run data modify block ~ ~ ~ front_text.messages[2] set value {text:"[ 2min ]",color:green}
+execute if score build_parkour.time state matches 3 run data modify block ~ ~ ~ front_text.messages[2] set value {text:"[ 3min ]",color:aqua}
+execute if score build_parkour.time state matches 4 run data modify block ~ ~ ~ front_text.messages[2] set value {text:"[ 4min ]",color:aqua}

data/scoreboard.dat

@@ -10,9 +10,19 @@ tellraw @a[team=build_parkour] ["\n§6    游戏将在§e3§6秒后开始！ ","
 schedule clear minecraft:build_parkour/summon
 # schedule function minecraft:build_parkour/summon 5s replace
 tag @a remove build_parkour.nokiller
-tag @a[team=build_parkour,gamemode=adventure] add build_parkour.nokiller
+
+scoreboard players set wait.player tick 0
+execute as @a[team=build_parkour,gamemode=adventure] run scoreboard players add wait.player tick 1
+
 tag @a remove build_parkour.builder
 
+execute if score total.start_game_mode board matches 1 if score wait.player tick matches 6.. run tellraw @a[team=build_parkour] ["\n\u00a7c由于人数过多，故只有部分玩家能够建造跑酷。"]
+execute if score total.start_game_mode board matches 1 run tag @a[team=build_parkour,gamemode=adventure,limit=5,sort=random] add build_parkour.nokiller
+execute if score total.start_game_mode board matches 1 if score wait.player tick matches 6.. run tellraw @a[team=build_parkour] ["\u00a7c他们是：",{selector:"@a[tag=build_parkour.nokiller]"},"\n"]
+
+execute unless score total.start_game_mode board matches 1 run tag @a[team=build_parkour,gamemode=adventure] add build_parkour.nokiller
+
+
 tellraw @a[team=build_parkour] ["\n\u00a7a\u00a7l 你建我跑\n\u00a76\u00a7l 游戏规则\n\u00a7b 建造一个你能通过但其他人无法通过的跑酷！\n"]
 scoreboard players set build_parkour.state state 2
 function minecraft:build_parkour/next_round

datapacks/map_all/data/minecraft/function/battle/ranpotion.mcfunction

@@ -11,10 +11,17 @@ tellraw @a [{text:""}]
 
 scoreboard players set build_parkour.time board 241
 
+# build_parkour.time state
+
 scoreboard players set build_parkour.player tick 0
 execute as @a[team=build_parkour,tag=!GLOBAL.SPEC] run scoreboard players add build_parkour.player tick 1
 execute if score build_parkour.player tick matches 6.. run scoreboard players set build_parkour.time board 121
 execute if score build_parkour.player tick matches 12.. run scoreboard players set build_parkour.time board 91
 execute if score build_parkour.player tick matches 18.. run scoreboard players set build_parkour.time board 61
 
+execute if score build_parkour.time state matches 1 run scoreboard players set build_parkour.time board 61
+execute if score build_parkour.time state matches 2 run scoreboard players set build_parkour.time board 121
+execute if score build_parkour.time state matches 3 run scoreboard players set build_parkour.time board 181
+execute if score build_parkour.time state matches 4 run scoreboard players set build_parkour.time board 241
+
 scoreboard players set build_parkour.state state 3

datapacks/map_game_3rd/data/minecraft/function/build_parkour/settings/time.mcfunction

@@ -9,7 +9,7 @@ execute if score bw.state state matches 1.. if score @s globle.game = bw globle.
 execute if score zombie.state state matches 1.. if score @s globle.game = zombie globle.game run function zombieever/rejoin
 execute if score gametotal state matches 1.. if score @s globle.game = game.total globle.game run function small_games/total/rejoin
 
-execute if entity @a[tag=merchant.alive] if score @s globle.game = game.merchant globle.game run function merchant/rejoin
+execute if score desk.state state matches 1.. if score desk.type board matches 3 if entity @a[tag=merchant.alive] if score @s globle.game = game.merchant globle.game run function merchant/rejoin
 
 execute if score twolf.state state matches 1.. as @s[team=wolfpeople] run function twolf/rejoin
 execute if score twolf.state state matches 1.. as @s[team=wait.wolfpeople] run function twolf/rejoin

datapacks/map_game_3rd/data/minecraft/function/build_parkour/start.mcfunction

@@ -2,6 +2,8 @@ scoreboard players set desk.state state 100
 gamemode spectator @a[team=deskgame,gamemode=adventure]
 schedule function minecraft:merchant/over/tp 5s replace
 tellraw @a[team=deskgame] ["\u00a7e游戏结束。你将在\u00a7c5s\u00a7e后传送。"]
+execute as @e[tag=merchant.npc,type=armor_stand] run function minecraft:merchant/player/action/npc/die
+
 tag @a remove merchant.player
 tag @a remove merchant.alive
 tag @a remove merchant.win

datapacks/map_game_3rd/data/minecraft/function/build_parkour/summon.mcfunction

@@ -1,15 +1,8 @@
-##
-## Datapack Upgrader v1.0.2 by wifi_left
-## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader
-## 
 scoreboard players set park.tmp board 0
 execute store result score park.tmp.x board run data get entity @s Pos[0]
 execute store result score park.tmp.y board run data get entity @s Pos[1]
 execute store result score park.tmp.z board run data get entity @s Pos[2]
-##
-## Datapack Upgrader v1.0.2 by wifi_left
-## If you encounter a problem, make an issue on https://github.com/wifi-left/Datapack-Upgrader
-## 
+
 execute store result storage minecraft:temp tp_pos.x int 1 run scoreboard players get @s park.x
 execute store result storage minecraft:temp tp_pos.y int 1 run scoreboard players get @s park.y
 execute store result storage minecraft:temp tp_pos.z int 1 run scoreboard players get @s park.z
@@ -22,4 +15,4 @@ execute if score park.tmp board matches 0 in lobby run function utils:tp with st
 # playsound ui.button.click player @s ~ ~ ~ 1 1 1
 execute at @s run playsound ui.button.click player @s ~ ~ ~ 10 1 1
 
-
+function minecraft:merchant/player/action/kill_my_npc