Merge branch 'master' of github.com:00ll00/LTW3

data/item/functions/bonus_item/add_score.mcfunction

@@ -2,9 +2,9 @@
 execute store result score #bonus_add_score mem run data get block 0 0 0 RecordItem.tag.bonus_add_score
 
 # 正常的加分
-execute unless score #bonus_add_score mem matches 100 run scoreboard players operation @s total_score += #bonus_add_score mem
-execute unless score #bonus_add_score mem matches 100 run scoreboard players operation @s total_score_disp += #bonus_add_score mem
-execute unless score #bonus_add_score mem matches 100 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了 ",{"score": {"name":"#bonus_add_score","objective": "mem"},"color":"aqua"},{"text": " 分","color":"aqua"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
+execute if score #bonus_add_score mem matches ..10 run scoreboard players operation @s total_score += #bonus_add_score mem
+execute if score #bonus_add_score mem matches ..10 run scoreboard players operation @s total_score_disp += #bonus_add_score mem
+execute if score #bonus_add_score mem matches ..10 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 获得了 ",{"score": {"name":"#bonus_add_score","objective": "mem"},"color":"aqua"},{"text": " 分","color":"aqua"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
 
 # 100：硬币
 scoreboard players set $random_max mem 1
@@ -15,4 +15,17 @@ execute if score #bonus_add_score mem matches 100 if score $random mem matches 1
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 的硬币投出了正面, 得分加倍, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"green"},{"text": " 分", "color":"green"}]
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run scoreboard players operation @s total_score /= $c_2 mem
 execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run scoreboard players operation @s total_score_disp /= $c_2 mem
-execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 得分减半, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 分", "color":"red"}]
+execute if score #bonus_add_score mem matches 100 if score $random mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 的硬币投出了反面, 得分减半, 当前共有 ",{"score": {"name": "@s","objective": "total_score"},"color":"red"},{"text": " 分", "color":"red"}]
+
+# 200：偷分
+execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score 1
+execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score_disp 1
+scoreboard players set #score_max mem -2147483648
+execute as @a run function ltw:main/get_max_score
+tag @a remove highest
+execute as @a if score @s total_score = #score_max mem run tag @s add highest
+execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score 1
+execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score_disp 1
+execute if score #bonus_add_score mem matches 200 if entity @s[tag=highest] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 试图偷取自己的分数……"]
+execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@a[tag=highest,limit=1,sort=furthest]","color":"red"}," 被偷取了 ",{"text": "1 分","color":"red"},", 当前共有 ",{"score": {"name": "@a[tag=highest,limit=1,sort=furthest]","objective": "total_score"}}, " 分"]
+execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"text": "1 分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 2,
+    "weight": 1,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/loot_tables/gameparty/last/green.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 26,
+    "weight": 1,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -14,6 +14,17 @@
             "tag": "{\"item_name\":\"{\\\"text\\\":\\\"得分 +2\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":2}"
         }
     ]
+},
+{
+    "type": "minecraft:item",
+    "weight": 1,
+    "name": "minecraft:gold_ingot",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 1 分\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200}"
+        }
+    ]
 }
 
 ]}]}

data/item/loot_tables/gameparty/last/purple.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 12,
+    "weight": 6,
     "name": "minecraft:nether_star",
     "functions": [
         {

data/item/loot_tables/gameparty/last/white.json

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 8,
+    "weight": 4,
     "name": "minecraft:nether_star",
     "functions": [
         {

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 9,
+    "weight": 8,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -17,7 +17,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 4,
     "name": "minecraft:snowball",
     "functions": [
         {

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 26,
+    "weight": 17,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -15,6 +15,17 @@
         }
     ]
 },
+{
+    "type": "minecraft:item",
+    "weight": 9,
+    "name": "minecraft:gold_ingot",
+    "functions": [
+        {
+            "function": "minecraft:set_nbt",
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"从最高分玩家处偷取 1 分\\\",\\\"color\\\":\\\"green\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":200}"
+        }
+    ]
+},
 {
     "type": "minecraft:item",
     "weight": 4,

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 18,
+    "weight": 12,
     "name": "minecraft:nether_star",
     "functions": [
         {

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

@@ -2,7 +2,7 @@
 
 {
     "type": "minecraft:item",
-    "weight": 12,
+    "weight": 10,
     "name": "minecraft:nether_star",
     "functions": [
         {
@@ -13,7 +13,7 @@
 },
 {
     "type": "minecraft:item",
-    "weight": 3,
+    "weight": 5,
     "name": "minecraft:paper",
     "functions": [
         {

data/item/tags/items/bonus.json

@@ -1,5 +1,6 @@
 {
     "values": [
+        "minecraft:gold_ingot",
         "minecraft:paper",
         "minecraft:target",
         "minecraft:snowball",

data/lib/advancements/damage_dealt.json

@@ -12,6 +12,6 @@
         }
     },
     "rewards": {
-        "function": "lib:damage_indicator/game/damage_dealt"
+        "function": "lib:damage_indicator/damage_dealt"
     }
 }

data/lib/advancements/damage_taken.json

@@ -12,6 +12,6 @@
         }
     },
     "rewards": {
-        "function": "lib:damage_indicator/game/damage_taken"
+        "function": "lib:damage_indicator/damage_taken"
     }
 }

data/lib/functions/damage_indicator/damage_dealt.mcfunction

@@ -1,5 +1,5 @@
-# 造成伤害加tag
-tag @s add damage_dealt
+# 小游戏阶段造成伤害判定
+execute if score $state mem matches 5 run function mini:main/damage_dealt
 
 # 移除造成伤害advancement
 advancement revoke @s only lib:damage_dealt

data/lib/functions/damage_indicator/damage_taken.mcfunction

@@ -1,5 +1,5 @@
-# 受到伤害加tag
-tag @s add damage_taken
+# 小游戏阶段受伤判定
+execute if score $state mem matches 5 run function mini:main/damage_taken
 
 # 移除受到伤害advancement
 advancement revoke @s only lib:damage_taken

data/lib/functions/damage_indicator/init.mcfunction

@@ -1,7 +0,0 @@
-# 计分板初始化
-scoreboard objectives remove damage_counter1
-scoreboard objectives remove damage_counter2
-scoreboard objectives remove damage_taken
-scoreboard objectives add damage_counter1 dummy "伤害计算(整数)"
-scoreboard objectives add damage_counter2 dummy "伤害计算(小数)"
-scoreboard objectives add damage_taken minecraft.custom:minecraft.damage_taken "受到伤害"

data/lib/functions/damage_indicator/player_hurt_player.mcfunction

@@ -1,21 +0,0 @@
-# 重置判定值
-scoreboard players set 除数 damage_counter1 10
-
-# 分数运算
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 /= 除数 damage_counter1
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 %= 除数 damage_counter1
-
-# 进行受伤提示
-tellraw @a[tag=damage_taken] [{"text":"[!] ","color":"red"},{"selector":"@a[tag=damage_dealt]","color":"white"},{"text":"对你造成了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-tellraw @a[tag=damage_dealt] [{"text":"[!] ","color":"red"},{"text":"你对","color":"white"},{"selector":"@a[tag=damage_taken]","color":"white"},{"text":"造成了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/player_hurt_player2.mcfunction

@@ -1,12 +0,0 @@
-# 进行受伤提示
-tellraw @a[tag=damage_taken] [{"text":"[!] ","color":"red"},{"selector":"@a[tag=damage_dealt]","color":"white"},{"text":"对你造成了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-tellraw @a[tag=damage_dealt] [{"text":"[!] ","color":"red"},{"text":"你对","color":"white"},{"selector":"@a[tag=damage_taken]"},{"text":"造成了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/player_hurt_self.mcfunction

@@ -1,20 +0,0 @@
-# 重置判定值
-scoreboard players set 除数 damage_counter1 10
-
-# 分数运算
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 /= 除数 damage_counter1
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 %= 除数 damage_counter1
-
-# 进行受伤提示
-tellraw @a[tag=damage_taken,tag=damage_dealt,scores={damage_taken=0..}] [{"text":"[!] ","color":"red"},{"text":"你对自己造成了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/player_hurt_self2.mcfunction

@@ -1,11 +0,0 @@
-# 进行受伤提示
-tellraw @a[tag=damage_taken,tag=damage_dealt] [{"text":"[!] ","color":"red"},{"text":"你对自己造成了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/self_hurt.mcfunction

@@ -1,20 +0,0 @@
-# 重置判定值
-scoreboard players set 除数 damage_counter1 10
-
-# 分数运算
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 = @s damage_taken
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter1 /= 除数 damage_counter1
-execute as @a[scores={damage_taken=0..},tag=damage_taken] run scoreboard players operation @s damage_counter2 %= 除数 damage_counter1
-
-# 进行伤害提示
-tellraw @a[tag=damage_taken,scores={damage_taken=0..}] [{"text":"[!] ","color":"red"},{"text":"你受到了","color":"white"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter1"}},{"text":".","color":"red"},{"color":"red","score":{"name":"@a[tag=damage_taken,scores={damage_taken=0..}]","objective":"damage_counter2"}},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/self_hurt2.mcfunction

@@ -1,11 +0,0 @@
-# 进行伤害提示
-tellraw @a[tag=damage_taken] [{"text":"[!] ","color":"red"},{"text":"你受到了","color":"white"},{"text":"0.0","color":"red"},{"text":"点伤害","color":"white"}]
-
-# 重置分数
-scoreboard players set @a[tag=damage_taken] damage_counter1 0
-scoreboard players set @a[tag=damage_taken] damage_counter2 0
-scoreboard players reset @a[tag=damage_taken] damage_taken
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt

data/lib/functions/damage_indicator/tick1.mcfunction

@@ -1,26 +0,0 @@
-# 检测玩家对玩家造成0点以上伤害
-execute if entity @a[tag=damage_dealt] if entity @a[tag=damage_taken,scores={damage_taken=0..}] unless entity @a[tag=damage_dealt,tag=damage_taken] run function lib:damage_indicator/player_hurt_player
-
-# 检测玩家对玩家造成0点伤害
-execute if entity @a[tag=damage_dealt] if entity @a[tag=damage_taken] unless entity @a[scores={damage_taken=0..}] unless entity @a[tag=damage_dealt,tag=damage_taken] run function lib:damage_indicator/player_hurt_player2
-
-# 检测玩家对自己造成0点以上伤害
-execute if entity @a[tag=damage_dealt,tag=damage_taken,scores={damage_taken=0..}] run function lib:damage_indicator/player_hurt_self
-
-# 检测玩家对自己造成0点伤害
-execute if entity @a[tag=damage_dealt,tag=damage_taken] unless entity @a[tag=damage_dealt,tag=damage_taken,scores={damage_taken=0..}] run function lib:damage_indicator/player_hurt_self2
-
-# 检测玩家因特殊原因受到0点以上伤害
-execute if entity @a[tag=damage_taken,scores={damage_taken=0..}] unless entity @a[tag=damage_dealt] run function lib:damage_indicator/self_hurt
-
-# 检测玩家因特殊原因受到0点伤害
-execute if entity @a[tag=damage_taken] unless entity @a[tag=damage_dealt] unless entity @a[tag=damage_taken,scores={damamge_taken=0..}] run function lib:damage_indicator/self_hurt2
-
-# 重置tag
-tag @a[tag=damage_taken] remove damage_taken
-tag @a[tag=damage_dealt] remove damage_dealt
-
-# 重置分数
-scoreboard players set @a[scores={damage_taken=0..}] damage_counter1 0
-scoreboard players set @a[scores={damage_taken=0..}] damage_counter2 0
-scoreboard players reset @a[scores={damage_taken=0..}] damage_taken

data/ltw/functions/main/player_leave.mcfunction

@@ -11,8 +11,6 @@ execute if score $state mem matches 5 if score $mini_type mem matches 3 run func
 
 # TODO : <! 紧急> [LTCat/HIM] 添加debug的tag，使debug人员不受游戏影响
 # FIXME : [010/HIM] 奖励选择房和跑酷图还有结构方块的线
-# FIXME : [010/HIM] 玩家可以钓鱼
-# FIXME : 喝完药的玻璃瓶没有 clear
 # FIXME : <! 紧急> 跑酷中途掉线导致名次判断错误
 # FIXME : <! 紧急> [010] 弩和箭可能给不到人
 # FIXME : [010/HIM] 关闭原版进度，它会给玩家经验值什么的很烦

data/mini/advancements/hotpm/damage_dealt.json

@@ -1,17 +0,0 @@
-{
-    "criteria": {
-        "hurt": {
-            "trigger": "minecraft:player_hurt_entity",
-            "conditions": {
-                "damage": {
-                    "taken": {
-                        "min": 0.1
-                    }
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "mini:hotpm/game/damage_dealt"
-    }
-}

data/mini/advancements/hotpm/damage_taken.json

@@ -1,17 +0,0 @@
-{
-    "criteria": {
-        "hurt": {
-            "trigger": "minecraft:entity_hurt_player",
-            "conditions": {
-                "damage": {
-                    "taken": {
-                        "min": 0.1
-                    }
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "mini:hotpm/game/damage_taken"
-    }
-}

data/mini/functions/colormatch/game_init.mcfunction

@@ -8,6 +8,8 @@ fill 1075 11 3999 1075 40 4025 stone
 fill 1075 11 3999 1049 40 3999 stone
 fill 1049 11 3999 1049 40 4025 stone
 fill 1049 11 4025 1075 40 4025 stone
+fill 1074 40 4000 1050 40 4024 barrier
+
 
 # 初始化
 scoreboard players set $finish_mode mem 0

data/mini/functions/hotpm/game/damage_dealt.mcfunction

@@ -1,8 +1,5 @@
-# 造成伤害时由玩家触发
-advancement revoke @s only mini:hotpm/damage_dealt
-
 # 如果是土豆持有者在热土豆游戏中打到人，才执行下一步
-execute as @s[tag=pm_holding] at @s if score $state mem matches 5 if score $mini_type mem matches 3 run function mini:hotpm/game/damage_dealt2
+execute if entity @s[tag=pm_holding] at @s run function mini:hotpm/game/damage_dealt2
 
 # 结束伤害判断
 tag @a remove pm_damage_dealt

data/mini/functions/hotpm/game/damage_dealt2.mcfunction

@@ -1,5 +1,4 @@
 # 土豆持有者打到人时执行
-
 tag @s add pm_damage_dealt
 function lib:sounds/hit
 

data/mini/functions/hotpm/game/damage_taken.mcfunction

@@ -1,5 +1,2 @@
-# 受到伤害时由玩家触发
-advancement revoke @s only mini:hotpm/damage_taken
-
 # 添加受伤 Tag
-execute if score $state mem matches 5 if score $mini_type mem matches 3 run tag @s add pm_damage_taken
+tag @s add pm_damage_taken

data/mini/functions/main/damage_dealt.mcfunction

@@ -0,0 +1,2 @@
+# 检测分数调用对应函数
+execute if score $mini_type mem matches 3 run function mini:hotpm/game/damage_dealt

data/mini/functions/main/damage_taken.mcfunction

@@ -0,0 +1,3 @@
+# 检测分数调用对应函数
+execute if score $mini_type mem matches 3 run function mini:hotpm/game/damage_taken
+execute if score $mini_type mem matches 5 run function mini:zombie/game/damage_taken

data/mini/functions/tntrun/player_intro.mcfunction

@@ -6,5 +6,3 @@ tellraw @s ["",{"text": " <PVP 干扰> ","color":"light_purple","bold": true}, {
 tellraw @s ["",{"text": " <额外道具> ","color":"aqua","bold": true}, {"text":"小游戏地图中存在 1 个白色道具。","color":"gray"}]
 tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""
-
-# FIXME : [HIM] ColorMatch 用屏障封顶防末影珍珠

data/mini/functions/zombie/game/damage_taken.mcfunction

@@ -0,0 +1,3 @@
+# TODO 判断玩家是否拥有无敌，如果没有然后再加无敌效果
+# effect give @s resistance 2 4
+effect give @s speed 2 1

data/mini/functions/zombie/tick20.mcfunction

@@ -18,7 +18,7 @@ execute if score $countdown mem matches 130 run tellraw @a ["",{"text": ">> ","c
 execute if score $countdown mem matches 105 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "补给物资已经送达!","color":"aqua"}]
 execute if score $countdown mem matches 80 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"text": "猪灵开始取回他们的装备了!","color":"red"}]
 execute if score $countdown mem matches 80 run scoreboard players set $random mem 1
-execute if score $countdown mem matches 55 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "补给物资已经送达!","color":"aqua"}]
+# execute if score $countdown mem matches 55 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "补给物资已经送达!","color":"aqua"}]
 
 # 召唤猪灵
 execute if score $random mem matches ..10 if score $countdown mem matches 81.. run function mini:zombie/game/summon_empty