*

data/mini/functions/diamond/game_start.mcfunction

@@ -9,6 +9,8 @@ scoreboard players set $bossbar_color mem 4
 scoreboard players set $countdown_max mem 270
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
+bossbar set mini:red name "剩余时间"
+bossbar set mini:yellow name "剩余时间"
 bossbar set mini:blue name "剩余时间"
 
 # 世界边界

data/mini/functions/diamond/player_intro.mcfunction

@@ -1,7 +1,7 @@
 # 向单个玩家展示小游戏介绍
 tp @s[team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
-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": " <PVP> ","color":"light_purple","bold": true}, {"text":"死亡会掉落所有物品, 被击杀后立即复活。","color":"gray"}]
+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": " <PVP> ","color":"light_purple","bold": true}, {"text":"死亡会掉落一半物品, 被击杀后能立即复活。","color":"gray"}]
 tellraw @s ["",{"text": " <早期测试> ","color":"dark_red","bold": true}, {"text":"此游戏目前尚在早期测试, 可能非常不稳定!","color":"dark_red"}]
 tellraw @s ""

data/mini/functions/diamond/tick20.mcfunction

@@ -8,14 +8,14 @@ execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds
 # 170s：关闭循环播放
 execute if score $countdown mem matches 170 run scoreboard players set @a music_time 999
 
-# 70s / 30s：雷达提示
-execute if score $countdown mem matches 70 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达将在 ",{"text": "30 秒 ","color": "gold"}, "后开启!"]
-execute if score $countdown mem matches 70 run scoreboard players set $bossbar_color mem 2
-execute if score $countdown mem matches 70 run function lib:bossbar/show
-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/music/mini_fast
-execute if score $countdown mem matches 40 run scoreboard players set $bossbar_color mem 1
-execute if score $countdown mem matches 40 run function lib:bossbar/show
+# 90s / 60s：雷达提示
+execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达将在 ",{"text": "30 秒 ","color": "gold"}, "后开启!"]
+execute if score $countdown mem matches 90 run scoreboard players set $bossbar_color mem 2
+execute if score $countdown mem matches 90 run function lib:bossbar/show
+execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},"玩家雷达已开启, 游戏将在 ",{"text": "60 秒 ","color": "gold"}, "后结束!"]
+execute if score $countdown mem matches 60 as @a run function lib:sounds/music/mini_fast
+execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 1
+execute if score $countdown mem matches 60 run function lib:bossbar/show
 
 # 0s：游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end

data/mini/functions/diamond/tick5.mcfunction

@@ -2,10 +2,10 @@
 # 更新钻石数量
 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 true
-effect give @a[scores={diamond=1..}] glowing 5 0 true
+# effect give @a[scores={diamond=1..}] glowing 5 0 true
 
 # 显示提示
-execute as @a[scores={diamond=1..},tag=!diamond_got] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s"},{"text":" 获得了闪闪发光的钻石!","color":"aqua"}]
-execute as @a[scores={diamond=1..},tag=!diamond_got] as @a[distance=1..] run function lib:sounds/hit
+execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=1000,dx=32,dy=252,dz=32] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s"},{"text":" 获得了闪闪发光的钻石!","color":"aqua"}]
+execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=1000,dx=32,dy=252,dz=32] as @a[distance=1..] run function lib:sounds/hit
 tag @a remove diamond_got
 tag @a[scores={diamond=1..}] add diamond_got

data/mini/loot_tables/diamond.json

@@ -1,4 +1,4 @@
-{"pools": [{"rolls": 2,"entries": [
+{"pools": [{"rolls": {"max": 3,"min": 2},"entries": [
 
     {
         "type": "minecraft:item",
@@ -24,7 +24,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 3,
+        "weight": 6,
         "name": "minecraft:diamond"
     }