LTCatt 5 лет назад
Родитель
Сommit
abd0f7f4fd

+ 0 - 0
data/mini/functions/diamond/game/respawn1.mcfunction → data/mini/functions/diamond/game/respawn.mcfunction


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

@@ -20,4 +20,4 @@ gamemode survival @s[team=playing,tag=!rejoining]
 
 # 执行重生方法
 tag @s remove respawning
-function mini:diamond/game/respawn1
+function mini:diamond/game/respawn

+ 0 - 1
data/mini/functions/main/tick5.mcfunction

@@ -5,7 +5,6 @@ execute if score $mini_type mem matches 2 run function mini:tntrun/tick5
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick5
 execute if score $mini_type mem matches 5 run function mini:phantom/tick5
 execute if score $mini_type mem matches 6 run function mini:diamond/tick5
-execute if score $mini_type mem matches 8 run function mini:trade/tick5
 
 # 同步生命值
 scoreboard players reset * temp

+ 0 - 3
data/mini/functions/trade/game/give_emerald.mcfunction

@@ -1,3 +0,0 @@
-give @s emerald
-scoreboard players remove #emerald_count temp 1
-execute if score #emerald_count temp matches 1.. run function mini:trade/game/give_emerald

+ 0 - 0
data/mini/functions/trade/game/respawn1.mcfunction → data/mini/functions/trade/game/respawn.mcfunction


+ 2 - 2
data/mini/functions/trade/game_start.mcfunction

@@ -1,12 +1,12 @@
 gamerule doDaylightCycle true
-scoreboard players set $countdown mem 270
+scoreboard players set $countdown mem 250
 
 # HUD
 scoreboard objectives setdisplay list health_disp
 scoreboard objectives setdisplay belowName health_disp
 scoreboard objectives setdisplay sidebar emerald
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 270
+scoreboard players set $countdown_max mem 250
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:red name "剩余时间"

+ 1 - 1
data/mini/functions/trade/player_death.mcfunction

@@ -1,5 +1,5 @@
 # 执行重生方法
-function mini:trade/game/respawn1
+function mini:trade/game/respawn
 
 # 复活特效
 execute as @a at @s run function lib:sounds/error

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

@@ -1,5 +1,5 @@
 # 单个玩家开始小游戏时执行
-function lib:sounds/music/mini_slow
+function lib:sounds/music/mini_secret
 title @s clear
 title @s actionbar ""
 

+ 3 - 0
data/mini/functions/trade/tick20.mcfunction

@@ -1,4 +1,7 @@
 
+# 更新绿宝石数量
+execute as @a[team=playing] store result score @s emerald run clear @s emerald 0
+
 # 显示倒计时
 execute if score $countdown mem matches ..10 run title @a times 3 14 2
 execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"name":"$countdown","objective":"mem"}}

+ 0 - 3
data/mini/functions/trade/tick5.mcfunction

@@ -1,3 +0,0 @@
-
-# 更新绿宝石数量
-execute as @a[team=playing] store result score @s emerald run clear @s emerald 0