*

data/item/functions/bonus_item/gameparty/random.mcfunction

@@ -1,4 +1,4 @@
 # 根据轮数生成对应的物品
 
-execute if score $round mem matches ..5 run function item:bonus_item/gameparty/normal/random
-execute if score $round mem matches 6 run function item:bonus_item/gameparty/last/random
+execute if score $round mem matches ..4 run function item:bonus_item/gameparty/normal/random
+execute if score $round mem matches 5 run function item:bonus_item/gameparty/last/random

data/item/loot_tables/gameparty/normal/blue.json

@@ -29,11 +29,11 @@
 {
     "type": "minecraft:item",
     "weight": 4,
-    "name": "minecraft:iron_axe",
+    "name": "minecraft:iron_sword",
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<击退 II> 铁斧\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Enchantments\":[{\"id\":\"knockback\",\"lvl\":2}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<击退 II> 铁斧\\\",\\\"italic\\\":0,\\\"color\\\":\\\"aqua\\\"}\"}}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"<击退 I> 铁剑\\\",\\\"color\\\":\\\"aqua\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_return\":1b,\"Enchantments\":[{\"id\":\"knockback\",\"lvl\":1}],\"display\":{\"Name\":\"{\\\"text\\\":\\\"<击退 I> 铁剑\\\",\\\"italic\\\":0,\\\"color\\\":\\\"aqua\\\"}\"}}"
         }
     ]
 },

data/item/tags/items/bonus.json

@@ -11,7 +11,6 @@
         "minecraft:iron_sword",
         "minecraft:nether_star",
         "minecraft:trident",
-        "minecraft:iron_axe",
         "minecraft:wooden_axe",
         "minecraft:fishing_rod",
         "minecraft:shield",

data/ltw/functions/main/player_enter.mcfunction

@@ -26,7 +26,7 @@ function lib:bossbar/show
 # TODO: [LTCat/HIM] 土豆的两个炸弹同时爆炸把两个人炸死，让他们俩并列第三（按存活回合数记分）
 # FIXME: 旁观者在一轮开始时会被切换为冒险模式又切回去，这会造成游戏模式变更提示，鬼知道为啥
 # FIXME: [010] 如果有人没领取奖励，可以一直站在上面，在奖励领取阶段结束时再拿到一次
-# FIXME: [LTCat] 最后一轮还是会刷出道具
-# TODO: [LTCat] 优化色彩迷阵的加速算法
 # FIXME: 准备倒计时与 Tooltip 降低不一致
-# FIXME: [LTCat] 初尝胜果 成就的判断似乎存在 Bug
+# FIXME: [LTCat] 初尝胜果 成就的判断似乎存在 Bug
+# FIXME: 修复 钻石风暴 spreadplayers 无效
+# FIXME: 修复 钻石风暴 刚开始在空中可以把人打飞

data/mini/functions/colormatch/game/start_new_round.mcfunction

@@ -4,8 +4,10 @@ function mini:colormatch/game/replace_wall
 execute positioned 1001 10 4000 run clone ~ ~ ~ ~24 ~ ~24 1050 15 4000
 
 # 设置倒计时
-execute if score $color_match_time mem matches 37.. run scoreboard players remove $color_match_time mem 5
-execute if score $color_match_time mem matches 11..36 run scoreboard players remove $color_match_time mem 1
+scoreboard players remove $color_match_time mem 3
+execute if entity @a[tag=color_match_fall] run scoreboard players add $color_match_time mem 5
+execute if score $color_match_time mem matches 30.. run scoreboard players remove $color_match_time mem 3
+execute if score $color_match_time mem matches ..10 run scoreboard players set $color_match_time mem 11
 scoreboard players operation $countdown_fast mem = $color_match_time mem
 
 # 重置分数
@@ -13,7 +15,7 @@ scoreboard players set $color_match_type mem 0
 
 # 拉玩家下来
 execute as @a[tag=color_match_fall] at @s run tp @s ~ 17 ~
-execute if entity @a[tag=color_match_fall] run scoreboard players add $countdown_fast mem 10
+execute if entity @a[tag=color_match_fall] run scoreboard players add $countdown_fast mem 5
 tag @a[tag=color_match_fall] remove color_match_fall
 
 # 告知玩家