热修

data/item/functions/shop/check.mcfunction

@@ -2,7 +2,7 @@
 execute if score @s buy_trigger matches 001..099 at @s unless entity @s[x=-3,z=-63,y=6,dx=25,dy=6,dz=30] run function item:shop/error/piglin
 execute if score @s buy_trigger matches 100..199 at @s unless entity @s[x=1,z=-63,y=20,dx=5,dy=4,dz=6] run function item:shop/error/piglin
 execute if score @s buy_trigger matches 200..299 at @s unless entity @s[x=-22,z=-75,y=18,dx=10,dy=4,dz=5] run function item:shop/error/villager
-execute if score @s buy_trigger matches 999 at @s unless entity @s[x=-3,z=-49,y=27,dx=5,dy=4,dz=5] run function item:shop/error/dice
+execute if score @s buy_trigger matches 666..999 at @s unless entity @s[x=-3,z=-49,y=27,dx=5,dy=4,dz=5] run function item:shop/error/dice
 
 # 普通商店
 execute if score @s buy_trigger matches 011 if score $state mem matches 0 run function item:shop/buy/011_bow

data/item/loot_tables/mixed/green.json

@@ -32,7 +32,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机蓝色道具 x3\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"blue\",Count:3}]}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机蓝色道具 x3\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"green\",Count:3}]}"
             }
         ]
     },

data/ltw/advancements/blood/iron2.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · β "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 20 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 25 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/iron3.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · γ "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 30 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 40 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/iron4.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · Ω "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 45 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 60 块铁锭\n", "color":"gray"},
         {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
       ],
       "frame": "challenge",

data/ltw/advancements/vs/emerald1.json

@@ -8,7 +8,7 @@
         "text": "商业奇迹 · α "
       },
       "description": [
-        {"text": "【贸易专家】持有 7 个绿宝石\n", "color":"gray"},
+        {"text": "【贸易专家】持有 8 个绿宝石\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/mini/functions/ass/game_start.mcfunction

@@ -4,7 +4,7 @@ scoreboard players set $countdown mem 90
 # HUD
 scoreboard objectives setdisplay list health_disp
 scoreboard objectives setdisplay belowName health_disp
-scoreboard objectives setdisplay sidebar health_disp
+scoreboard objectives setdisplay sidebar health
 scoreboard players set $bossbar_color mem 3
 scoreboard players set $countdown_max mem 90
 scoreboard players set $bossbar_type mem 2

data/mini/functions/iron/tick20.mcfunction

@@ -41,6 +41,6 @@ execute if score $foursec mem matches 1 run schedule function mini:iron/game/cle
 
 # 给予进度
 advancement grant @a[team=playing,scores={iron_count=10..}] only ltw:blood/iron1
-advancement grant @a[team=playing,scores={iron_count=20..}] only ltw:blood/iron2
-advancement grant @a[team=playing,scores={iron_count=30..}] only ltw:blood/iron3
-advancement grant @a[team=playing,scores={iron_count=45..}] only ltw:blood/iron4
+advancement grant @a[team=playing,scores={iron_count=25..}] only ltw:blood/iron2
+advancement grant @a[team=playing,scores={iron_count=40..}] only ltw:blood/iron3
+advancement grant @a[team=playing,scores={iron_count=60..}] only ltw:blood/iron4

data/mini/functions/parkour/player_finished.mcfunction

@@ -17,7 +17,7 @@ execute if entity @s[tag=!rejoining] if score $player_finish mem matches 1 run t
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches 2..3 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s"},{"text": " 已到达终点！第 ","color":"green"},{"score": {"name": "$player_finish","objective": "mem"},"color":"green"},{"text": " 名！","color":"green"}]
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches 3 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "前三名已全部决出！无需再前往终点了，专心收集宝藏吧！","color":"aqua"}]
 execute if entity @s[tag=!rejoining] if score $player_finish mem matches ..2 run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text": "继续收集宝藏，直到时间结束吧！","color":"aqua"}]
-execute as @a at @s run function lib:sounds/levelup
+execute if score $player_finish mem matches ..3 as @a at @s run function lib:sounds/levelup
 
 # 给已完成的玩家加分
 scoreboard players add @a[tag=!mini_running] mini_score 1

data/mini/functions/phantom/game/new_item.mcfunction

@@ -2,4 +2,4 @@ function item:bonus_item/gameparty/auto/low
 execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.6,0.0]}
 particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
 kill @s
-tellraw @a ["\n",{"text": ">> ","color":"gold","bold": true},{"text": "红色幻翼已被击杀！\n","color":"gold"}]
+tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "红色幻翼已被击杀！","color":"red"}]

data/mini/functions/phantom/game/summon2.mcfunction

@@ -6,7 +6,7 @@ attribute @e[tag=new_phantom,limit=1] generic.max_health base set 2
 attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 4
 
 # 如果满足条件（在 tick20 中检查），则刷出奖励幻翼
-execute if score #new_item mem matches 0 run title @a subtitle {"text":"❇ 击杀红色幻翼, 获取奖励物资 ❇","color":"red"}
+execute if score #new_item mem matches 0 run tellraw @a ["\n",{"text": ">> ","color":"red","bold": true},{"text": "击杀红色幻翼, 获取奖励物资！\n","color":"red"}]
 execute if score #new_item mem matches 0 run title @a times 1 80 3
 execute if score #new_item mem matches 0 run title @a title ""
 execute if score #new_item mem matches 0 run playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2

data/mini/functions/trade/game_end.mcfunction

@@ -12,6 +12,7 @@ gamerule fireDamage false
 gamerule drowningDamage false
 
 # 计算积分
+scoreboard players set @a[team=playing] mini_score 0
 execute as @a[team=playing] run scoreboard players operation @s mini_score += @s emerald
 
 # 清理物品栏

data/mini/functions/trade/tick20.mcfunction

@@ -14,8 +14,15 @@ execute if score $countdown mem matches 120 run title @a subtitle {"text":"⚠
 execute if score $countdown mem matches 120 run title @a times 1 50 3
 execute if score $countdown mem matches 120 run title @a title ""
 
+# 60s：时间提示
+execute if score $countdown mem matches 60 run title @a subtitle {"text":"⚠ 还剩一分钟！ ⚠","color":"yellow"}
+execute if score $countdown mem matches 60 run title @a times 1 50 3
+execute if score $countdown mem matches 60 run title @a title ""
+execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 2
+execute if score $countdown mem matches 60 run function lib:bossbar/show
+
 # 30s：时间提示
-execute if score $countdown mem matches 30 run title @a subtitle {"text":"⚠ 还剩三十秒！ ⚠","color":"yellow"}
+execute if score $countdown mem matches 30 run title @a subtitle {"text":"⚠ 最后三十秒！ ⚠","color":"gold"}
 execute if score $countdown mem matches 30 run title @a times 1 50 3
 execute if score $countdown mem matches 30 run title @a title ""
 
@@ -37,13 +44,8 @@ scoreboard players reset * temp2
 execute as @a[team=playing] store result score @s temp2 run clear @s nether_star
 execute as @a[scores={temp2=1..}] at @s run function mini:trade/game/get_score
 
-# 60s 提示
-execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text":"游戏将在 ","color": "gold"}, "60 秒 ",{"text": "后结束","color": "gold"}]
-execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 2
-execute if score $countdown mem matches 60 run function lib:bossbar/show
-
 # 给予进度
-execute as @a[team=playing] if score @s emerald matches 7.. run advancement grant @s only ltw:vs/emerald1
+execute as @a[team=playing] if score @s emerald matches 8.. run advancement grant @s only ltw:vs/emerald1
 execute as @e[tag=TradePlayer,tag=!adv3_checked] unless entity @s[nbt={Offers:{Recipes:[{sell:{id:"minecraft:emerald"},uses:0}]}}] run tag @s add adv3_achieved
 execute as @a[team=playing] if score @s player_id = @e[tag=TradePlayer,tag=adv3_achieved,tag=!adv3_checked,limit=1] player_id run advancement grant @s only ltw:vs/emerald3
 tag @e[tag=TradePlayer,tag=adv3_achieved,tag=!adv3_checked] add adv3_checked