龙腾猫跃 3 лет назад
Родитель
Сommit
f3e7d22862
35 измененных файлов с 277 добавлено и 44 удалено
  1. 28 0
      data/ltw/advancements/blood/ass1.json
  2. 28 0
      data/ltw/advancements/blood/ass2.json
  3. 28 0
      data/ltw/advancements/blood/ass3.json
  4. 1 1
      data/ltw/advancements/blood/iron3.json
  5. 4 1
      data/ltw/advancements/blood/iron4.json
  6. 1 1
      data/ltw/advancements/blood/phantom3.json
  7. 3 0
      data/ltw/advancements/blood/phantom4.json
  8. 1 1
      data/ltw/advancements/parkour/tnt3.json
  9. 1 1
      data/ltw/advancements/parkour/treasure3.json
  10. 3 0
      data/ltw/advancements/parkour/treasure4.json
  11. 27 0
      data/ltw/advancements/story/challenger1.json
  12. 30 0
      data/ltw/advancements/story/challenger2.json
  13. 33 0
      data/ltw/advancements/story/challenger3.json
  14. 25 0
      data/ltw/advancements/story/challenger4.json
  15. 1 1
      data/ltw/advancements/story/score3.json
  16. 3 0
      data/ltw/advancements/story/score4.json
  17. 1 3
      data/ltw/advancements/story/win1.json
  18. 4 3
      data/ltw/advancements/story/win2.json
  19. 11 4
      data/ltw/advancements/story/win3.json
  20. 4 3
      data/ltw/advancements/story/win4.json
  21. 1 1
      data/ltw/advancements/vs/colormatch3.json
  22. 1 1
      data/ltw/advancements/vs/emerald3.json
  23. 1 1
      data/ltw/advancements/vs/potato3.json
  24. 2 0
      data/ltw/functions/advancement/bonus_1.mcfunction
  25. 2 0
      data/ltw/functions/advancement/bonus_2.mcfunction
  26. 7 4
      data/ltw/functions/advancement/bonus_3.mcfunction
  27. 3 6
      data/ltw/functions/advancement/bonus_4.mcfunction
  28. 10 2
      data/ltw/functions/init.mcfunction
  29. 0 4
      data/ltw/functions/main/game_end.mcfunction
  30. 4 2
      data/mini/functions/ass/player_death.mcfunction
  31. 3 1
      data/mini/functions/ass/tick20.mcfunction
  32. 3 0
      data/mini/functions/main/game_end.mcfunction
  33. 1 1
      data/mini/functions/main/player_failed.mcfunction
  34. 1 1
      data/mini/functions/phantom/game/new_item.mcfunction
  35. 1 1
      data/mini/functions/phantom/game/summon2.mcfunction

+ 28 - 0
data/ltw/advancements/blood/ass1.json

@@ -0,0 +1,28 @@
+{
+    "parent": "ltw:blood/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:gunpowder"
+      },
+      "title": {
+        "text": "爆破学家 · α "
+      },
+      "description": [
+        {"text": "【核爆刺客】在倒计时结束前获胜\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "1 绿宝石","color":"white"}
+      ],
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_1"
+    },
+    "criteria": {
+      "a":{
+          "trigger": "minecraft:impossible"
+      }
+    }
+  }

+ 28 - 0
data/ltw/advancements/blood/ass2.json

@@ -0,0 +1,28 @@
+{
+    "parent": "ltw:blood/ass1",
+    "display": {
+      "icon": {
+        "item": "minecraft:flint_and_steel"
+      },
+      "title": {
+        "text": "爆破学家 · β "
+      },
+      "description": [
+        {"text": "【核爆刺客】在剩余至少 5 颗心时获胜\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "2 绿宝石","color":"white"}
+      ],
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_2"
+    },
+    "criteria": {
+      "a":{
+          "trigger": "minecraft:impossible"
+      }
+    }
+  }

+ 28 - 0
data/ltw/advancements/blood/ass3.json

@@ -0,0 +1,28 @@
+{
+    "parent": "ltw:blood/ass2",
+    "display": {
+      "icon": {
+        "item": "minecraft:creeper_spawn_egg"
+      },
+      "title": {
+        "text": "爆破学家 · γ "
+      },
+      "description": [
+        {"text": "【核爆刺客】在满生命时获胜\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "2 绿宝石","color":"white"}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_3"
+    },
+    "criteria": {
+      "a":{
+          "trigger": "minecraft:impossible"
+      }
+    }
+  }

+ 1 - 1
data/ltw/advancements/blood/iron3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "【钢铁狂潮】拥有 35 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 4 - 1
data/ltw/advancements/blood/iron4.json

@@ -14,7 +14,10 @@
       "frame": "challenge",
       "show_toast": true,
       "announce_to_chat": true,
-      "hidden": false
+      "hidden": true
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_4"
     },
     "criteria": {
       "a":{

+ 1 - 1
data/ltw/advancements/blood/phantom3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "【月夜狩猎】击杀 24 只幻翼\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 3 - 0
data/ltw/advancements/blood/phantom4.json

@@ -16,6 +16,9 @@
       "announce_to_chat": true,
       "hidden": true
     },
+    "rewards": {
+      "function": "ltw:advancement/bonus_4"
+    },
     "criteria": {
       "a":{
           "trigger": "minecraft:impossible"

+ 1 - 1
data/ltw/advancements/parkour/tnt3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "【地陷圣坛】几乎清空最顶层的所有方块\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 1 - 1
data/ltw/advancements/parkour/treasure3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "【遗迹寻宝】在 40 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 3 - 0
data/ltw/advancements/parkour/treasure4.json

@@ -17,6 +17,9 @@
       "announce_to_chat": true,
       "hidden": true
     },
+    "rewards": {
+      "function": "ltw:advancement/bonus_4"
+    },
     "criteria": {
       "a":{
           "trigger": "minecraft:impossible"

+ 27 - 0
data/ltw/advancements/story/challenger1.json

@@ -0,0 +1,27 @@
+{
+    "parent": "ltw:story/root",
+    "display": {
+      "icon": {
+        "item": "minecraft:stone_pickaxe"
+      },
+      "title": {
+        "text": "挑战极限 · α "
+      },
+      "description": [
+        {"text": "完成 2 项挑战进度\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "1 绿宝石","color":"white"}
+      ],
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_1"
+    },
+    "criteria": {
+      "01": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":1}},"condition":"entity_scores","entity":"this"}]}},
+      "02": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":2}},"condition":"entity_scores","entity":"this"}]}}
+    }
+}

+ 30 - 0
data/ltw/advancements/story/challenger2.json

@@ -0,0 +1,30 @@
+{
+    "parent": "ltw:story/challenger1",
+    "display": {
+      "icon": {
+        "item": "minecraft:iron_pickaxe"
+      },
+      "title": {
+        "text": "挑战极限 · β "
+      },
+      "description": [
+        {"text": "完成 5 项挑战进度\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "2 绿宝石","color":"white"}
+      ],
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_2"
+    },
+    "criteria": {
+      "01": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":1}},"condition":"entity_scores","entity":"this"}]}},
+      "02": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":2}},"condition":"entity_scores","entity":"this"}]}},
+      "03": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":3}},"condition":"entity_scores","entity":"this"}]}},
+      "04": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":4}},"condition":"entity_scores","entity":"this"}]}},
+      "05": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":5}},"condition":"entity_scores","entity":"this"}]}}
+    }
+  }

+ 33 - 0
data/ltw/advancements/story/challenger3.json

@@ -0,0 +1,33 @@
+{
+    "parent": "ltw:story/challenger2",
+    "display": {
+      "icon": {
+        "item": "minecraft:diamond_pickaxe"
+      },
+      "title": {
+        "text": "挑战极限 · γ "
+      },
+      "description": [
+        {"text": "完成 8 项挑战进度\n", "color":"gray"},
+        {"text": "奖励: ","color":"green"},
+        {"text": "2 绿宝石","color":"white"}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_3"
+    },
+    "criteria": {
+      "01": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":1}},"condition":"entity_scores","entity":"this"}]}},
+      "02": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":2}},"condition":"entity_scores","entity":"this"}]}},
+      "03": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":3}},"condition":"entity_scores","entity":"this"}]}},
+      "04": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":4}},"condition":"entity_scores","entity":"this"}]}},
+      "05": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":5}},"condition":"entity_scores","entity":"this"}]}},
+      "06": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":6}},"condition":"entity_scores","entity":"this"}]}},
+      "07": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":7}},"condition":"entity_scores","entity":"this"}]}},
+      "08": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":8}},"condition":"entity_scores","entity":"this"}]}}
+    }
+  }

+ 25 - 0
data/ltw/advancements/story/challenger4.json

@@ -0,0 +1,25 @@
+{
+    "parent": "ltw:story/challenger3",
+    "display": {
+      "icon": {
+        "item": "minecraft:netherite_pickaxe"
+      },
+      "title": {
+        "text": "挑战极限 · Ω "
+      },
+      "description": [
+        {"text": "完成 12 项挑战进度\n", "color":"gray"},
+        {"text": "究极隐藏挑战!","color":"dark_gray","italic": true}
+      ],
+      "frame": "challenge",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": true
+    },
+    "rewards": {
+      "function": "ltw:advancement/bonus_4"
+    },
+    "criteria": {
+      "a": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_adv_challenge":{"min":12}},"condition":"entity_scores","entity":"this"}]}}
+    }
+  }

+ 1 - 1
data/ltw/advancements/story/score3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "在单局游戏中达到 30 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 3 - 0
data/ltw/advancements/story/score4.json

@@ -16,6 +16,9 @@
       "announce_to_chat": true,
       "hidden": true
     },
+    "rewards": {
+      "function": "ltw:advancement/bonus_4"
+    },
     "criteria": {
       "a":{
           "trigger": "minecraft:impossible"

+ 1 - 3
data/ltw/advancements/story/win1.json

@@ -21,8 +21,6 @@
       "function": "ltw:advancement/bonus_1"
     },
     "criteria": {
-      "a":{
-          "trigger": "minecraft:impossible"
-      }
+      "01": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":1}},"condition":"entity_scores","entity":"this"}]}}
     }
 }

+ 4 - 3
data/ltw/advancements/story/win2.json

@@ -21,8 +21,9 @@
       "function": "ltw:advancement/bonus_2"
     },
     "criteria": {
-      "a":{
-          "trigger": "minecraft:impossible"
-      }
+      "01": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":1}},"condition":"entity_scores","entity":"this"}]}},
+      "02": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":2}},"condition":"entity_scores","entity":"this"}]}},
+      "03": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":3}},"condition":"entity_scores","entity":"this"}]}},
+      "04": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":4}},"condition":"entity_scores","entity":"this"}]}}
     }
   }

+ 11 - 4
data/ltw/advancements/story/win3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "获得 10 场游戏的胜利\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,
@@ -21,8 +21,15 @@
       "function": "ltw:advancement/bonus_3"
     },
     "criteria": {
-      "a":{
-          "trigger": "minecraft:impossible"
-      }
+      "01": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":1}},"condition":"entity_scores","entity":"this"}]}},
+      "02": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":2}},"condition":"entity_scores","entity":"this"}]}},
+      "03": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":3}},"condition":"entity_scores","entity":"this"}]}},
+      "04": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":4}},"condition":"entity_scores","entity":"this"}]}},
+      "05": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":5}},"condition":"entity_scores","entity":"this"}]}},
+      "06": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":6}},"condition":"entity_scores","entity":"this"}]}},
+      "07": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":7}},"condition":"entity_scores","entity":"this"}]}},
+      "08": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":8}},"condition":"entity_scores","entity":"this"}]}},
+      "09": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":9}},"condition":"entity_scores","entity":"this"}]}},
+      "10": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":10}},"condition":"entity_scores","entity":"this"}]}}
     }
   }

+ 4 - 3
data/ltw/advancements/story/win4.json

@@ -16,9 +16,10 @@
       "announce_to_chat": true,
       "hidden": true
     },
+    "rewards": {
+      "function": "ltw:advancement/bonus_4"
+    },
     "criteria": {
-      "a":{
-          "trigger": "minecraft:impossible"
-      }
+      "a": {"trigger":"minecraft:location","conditions":{"player":[{"scores":{"stat_win":{"min":25}},"condition":"entity_scores","entity":"this"}]}}
     }
   }

+ 1 - 1
data/ltw/advancements/vs/colormatch3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "【色彩迷阵】在满速切换后获胜,且不损失任何生命值\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 1 - 1
data/ltw/advancements/vs/emerald3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "【贸易专家】清空整个交易列表\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 1 - 1
data/ltw/advancements/vs/potato3.json

@@ -10,7 +10,7 @@
       "description": [
         {"text": "【炸弹狂魔】在剩余至少 5 颗心时获胜\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
-        {"text": "3 绿宝石","color":"white"}
+        {"text": "2 绿宝石","color":"white"}
       ],
       "frame": "challenge",
       "show_toast": true,

+ 2 - 0
data/ltw/functions/advancement/bonus_1.mcfunction

@@ -1,3 +1,5 @@
+scoreboard players add @s stat_adv 1
+scoreboard players add @s stat_adv_1 1
 scoreboard players add @s green 1
 scoreboard players add @s green_total 1
 scoreboard players add @s green_extra 1

+ 2 - 0
data/ltw/functions/advancement/bonus_2.mcfunction

@@ -1,3 +1,5 @@
+scoreboard players add @s stat_adv 1
+scoreboard players add @s stat_adv_2 1
 scoreboard players add @s green 2
 scoreboard players add @s green_total 2
 scoreboard players add @s green_extra 2

+ 7 - 4
data/ltw/functions/advancement/bonus_3.mcfunction

@@ -1,6 +1,9 @@
-scoreboard players add @s green 3
-scoreboard players add @s green_total 3
-scoreboard players add @s green_extra 3
+scoreboard players add @s stat_adv 1
+scoreboard players add @s stat_adv_challenge 1
+scoreboard players add @s stat_adv_3 1
+scoreboard players add @s green 2
+scoreboard players add @s green_total 2
+scoreboard players add @s green_extra 2
 execute if score $state mem matches 0 run function item:shop/refresh_green
 # MC 自己会播放完成音效
-tellraw @s ["",{"text": ">> ","color":"green","bold": true},"你获得了 ",{"text":"3 绿宝石","color":"green"}," 完成奖励!"]
+tellraw @s ["",{"text": ">> ","color":"green","bold": true},"你获得了 ",{"text":"2 绿宝石","color":"green"}," 完成奖励!"]

+ 3 - 6
data/ltw/functions/advancement/bonus_4.mcfunction

@@ -1,6 +1,3 @@
-scoreboard players add @s green 4
-scoreboard players add @s green_total 4
-scoreboard players add @s green_extra 4
-execute if score $state mem matches 0 run function item:shop/refresh_green
-# MC 自己会播放完成音效
-tellraw @s ["",{"text": ">> ","color":"green","bold": true},"你获得了 ",{"text":"4 绿宝石","color":"green"}," 完成奖励!"]
+scoreboard players add @s stat_adv 1
+scoreboard players add @s stat_adv_challenge 1
+scoreboard players add @s stat_adv_4 1

+ 10 - 2
data/ltw/functions/init.mcfunction

@@ -66,13 +66,21 @@ scoreboard objectives remove player_id
 scoreboard objectives add player_id dummy "玩家编号"
 scoreboard objectives remove music_time
 scoreboard objectives add music_time dummy "BGM 时间"
-scoreboard objectives add stat_total dummy "总场次"
-scoreboard objectives add stat_win dummy "总胜场"
 scoreboard objectives remove setup_trigger
 scoreboard objectives add setup_trigger trigger "触发器_视频设置"
 scoreboard players set $ game_id 0
 scoreboard players set $ round_id 0
 
+# 统计数据
+scoreboard objectives add stat_total dummy "总场次"
+scoreboard objectives add stat_win dummy "总胜场"
+scoreboard objectives add stat_adv_1 dummy "完成的 α 进度数"
+scoreboard objectives add stat_adv_2 dummy "完成的 β 进度数"
+scoreboard objectives add stat_adv_3 dummy "完成的 γ 进度数"
+scoreboard objectives add stat_adv_4 dummy "完成的 Ω 进度数"
+scoreboard objectives add stat_adv dummy "完成的进度数"
+scoreboard objectives add stat_adv_challenge dummy "完成的挑战进度数"
+
 # 常量与变量初始化
 scoreboard players set #mini_total mem 5
 scoreboard players set #-1 mem -1

+ 0 - 4
data/ltw/functions/main/game_end.mcfunction

@@ -28,10 +28,6 @@ tag @a[team=playing,tag=!total_rank1,tag=!total_rank2,tag=!total_rank3] add tota
 # 给予进度
 scoreboard players add @a[team=playing] stat_total 1
 scoreboard players add @a[tag=total_rank1] stat_win 1
-advancement grant @a[scores={stat_win=1..}] only ltw:story/win1
-advancement grant @a[scores={stat_win=4..}] only ltw:story/win2
-advancement grant @a[scores={stat_win=10..}] only ltw:story/win3
-advancement grant @a[scores={stat_win=25..}] only ltw:story/win4
 
 # 计算金粒奖励
 scoreboard players set #total_gold mem 0

+ 4 - 2
data/mini/functions/ass/player_death.mcfunction

@@ -7,5 +7,7 @@ tp @s[team=!debugging] 1032.34 27.11 7032.84 461.44 28.30
 # tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
 execute as @a at @s run function lib:sounds/error
 function mini:main/player_failed
-execute if score $player_alive mem matches ..2 run effect clear @a resistance
-# execute unless entity @a[tag=mini_running] run function mini:main/game_end
+# execute unless entity @a[tag=mini_running] run function mini:main/game_end
+
+execute if score $player_alive mem matches 2 if score $countdown mem matches 2.. run effect clear @a resistance
+execute if score $player_alive mem matches 2 if score $countdown mem matches 2.. run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "苦力怕现在会造成更多伤害!","color": "gold"}]

+ 3 - 1
data/mini/functions/ass/tick20.mcfunction

@@ -6,7 +6,9 @@ execute if score $countdown mem matches 1 run scoreboard players set $bossbar_co
 execute if score $countdown mem matches 1 run function lib:bossbar/show
 execute if score $countdown mem matches 1 as @a at @s run function lib:sounds/music/mini_fast
 execute if score $countdown mem matches 1 as @a at @s run function lib:sounds/dragon_growl
-execute if score $countdown mem matches ..0 run effect give @a[team=playing] wither 60 2 true
+execute if score $countdown mem matches 1 if score $player_alive mem matches 3.. run effect clear @a resistance
+execute if score $countdown mem matches 1 if score $player_alive mem matches 3.. run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "苦力怕现在会造成更多伤害!","color": "gold"}]
+execute if score $countdown mem matches ..0 run effect give @a[team=playing] wither 1000000 1 true
 
 # 回复生命值
 execute if score $countdown mem matches 1.. if score $foursec mem matches 1 if score $foursec mem matches 1 run effect give @a[team=playing] regeneration 1 10 true

+ 3 - 0
data/mini/functions/main/game_end.mcfunction

@@ -35,6 +35,9 @@ execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank
 execute if score $mini_type mem matches 3 run advancement grant @a[tag=mini_rank1,scores={mini_heart=5..}] only ltw:vs/potato3
 execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,scores={mini_heart=2..}] only ltw:parkour/colormatch2
 execute if score $mini_type mem matches 4 if score #max_speed mem matches 1 run advancement grant @a[tag=mini_rank1,tag=!colormatch_hurt] only ltw:parkour/colormatch3
+execute if score $mini_type mem matches 201 if score $countdown mem matches 1.. run advancement grant @a[tag=mini_rank1] only ltw:blood/ass1
+execute if score $mini_type mem matches 201 run advancement grant @a[tag=mini_rank1,scores={health_disp=10..}] only ltw:blood/ass2
+execute if score $mini_type mem matches 201 run advancement grant @a[tag=mini_rank1,scores={health_disp=20..}] only ltw:blood/ass3
 
 # 清理怪东西
 clear @a[team=!debugging] #mini:game_item{game_item:1b}

+ 1 - 1
data/mini/functions/main/player_failed.mcfunction

@@ -5,7 +5,7 @@ tag @s remove mini_running
 function mini:main/update_player_count
 
 # 显示提示
-execute if entity @s[tag=!rejoining] if score $player_alive mem matches 1.. run tellraw @a ["",{"text": ">> ","color":"red","bold":true},{"selector": "@s","color":"red"}," 已死亡! 还剩 ",{"score": {"name": "$player_alive","objective": "mem"}}," 人!"]
+execute if entity @s[tag=!rejoining] if score $player_alive mem matches 1.. run tellraw @a ["",{"text": ">> ","color":"red","bold":true},{"selector": "@s"},{"text": " 已死亡!还有 ","color":"red"},{"score": {"name": "$player_alive","objective": "mem"}}," 人",{"text": " 存活!","color":"red"}]
 execute as @a at @s run function lib:sounds/error
 
 # 给存活的玩家加分

+ 1 - 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.8,0.0]}
 particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
 kill @s
-tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "红色幻翼已被击杀!","color":"aqua"}]
+tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "红色幻翼已被击杀!","color":"gold"}]

+ 1 - 1
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 tellraw @a ["\n",{"text": ">> ","color":"aqua","bold": true},{"text": "击杀红色幻翼, 获取奖励物资!\n","color":"aqua"}]
+execute if score #new_item mem matches 0 run tellraw @a ["\n",{"text": ">> ","color":"gold","bold": true},{"text": "击杀红色幻翼, 获取奖励物资!\n","color":"gold"}]
 execute if score #new_item mem matches 0 run playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
 execute if score #new_item mem matches 0 run tag @e[tag=new_phantom] add bonus_phantom
 execute if score #new_item mem matches 0 run scoreboard players set $new_item_cd mem 0