2
0
LTCatt 5 жил өмнө
parent
commit
ecd72c5666

+ 2 - 1
data/mini/functions/diamond/game/respawn1.mcfunction

@@ -4,7 +4,8 @@ effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s haste 1000000 1 true
 effect give @s levitation 6 253
-effect give @s resistance 8 10 true
+effect give @s weakness 7 10 true
+effect give @s resistance 7 10 true
 gamerule naturalRegeneration false
 
 # 传送玩家

+ 1 - 1
data/mini/functions/diamond/game/respawn2.mcfunction

@@ -1,4 +1,4 @@
-tp @a[tag=respawning] ~ 263 ~
+tp @a[tag=respawning] ~ 265 ~
 execute as @e[type=item,tag=death_drop] run function item:disable_throw
 tag @e[type=item,tag=death_drop] remove death_drop
 tag @a remove respawning

+ 0 - 1
data/mini/functions/diamond/player_death.mcfunction

@@ -4,7 +4,6 @@ function mini:diamond/game/respawn1
 # 复活特效
 execute as @a at @s run function lib:sounds/error
 effect give @s blindness 3 5 true
-effect give @s weakness 30 1
 
 # 处理玩家掉落物品
 execute at @s as @e[type=item,distance=..100] store result score @s temp run data get entity @s Age

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

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

+ 8 - 3
data/mini/functions/diamond/tick20.mcfunction

@@ -5,11 +5,16 @@ execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"na
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
+# 170s:关闭循环播放
+execute if score $countdown mem matches 170 run scoreboard players set @a music_time 999
+
 # 60s / 30s:雷达提示
-execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达将在 ",{"text": "20 秒","color": "gold"}, "后开启!"]
-execute if score $countdown mem matches 40 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达已开启, 游戏将在 ",{"text": "40 秒","color": "gold"}, "后结束!"]
+execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达将在 ",{"text": "20 秒 ","color": "gold"}, "后开启!"]
+execute if score $countdown mem matches 60 as @a run function lib:sounds/music/mini_middle
+execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 2
+execute if score $countdown mem matches 40 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达已开启, 游戏将在 ",{"text": "40 秒 ","color": "gold"}, "后结束!"]
 execute if score $countdown mem matches 40 as @a run function lib:sounds/dragon_growl
-execute if score $countdown mem matches 40 as @a run function lib:sounds/music/mini_middle
+execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 1
 
 # 0s:游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end

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

@@ -1,8 +1,8 @@
 
 # 更新钻石数量
 execute as @a[team=playing] store result score @s diamond run clear @s diamond 0
-execute if score $countdown mem matches ..40 run effect give @a glowing 1000000 0
-effect give @a[scores={diamond=1..}] glowing 5 0
+execute if score $countdown mem matches ..40 run effect give @a glowing 1000000 0 false
+effect give @a[scores={diamond=1..}] glowing 5 0 false
 
 # 显示提示
 execute as @a[scores={diamond=1..},tag=!diamond_got] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s"},{"text":" 获得了闪闪发光的钻石!","color":"aqua"}]