第三波补丁（1）

data/item/functions/bonus_item/add_score.mcfunction

@@ -10,7 +10,7 @@ execute if score #bonus_add_score mem matches 1..10 run tellraw @a ["",{"text":
 execute if score #bonus_add_score mem matches 0 run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 没能获得积分……"]
 
 # 清零
-execute if score #bonus_add_score mem matches ..-1 if score @s total_score matches 0 run tellraw @a [{"text":"","color":"red"},{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"white"}," 的 ",{"score": {"name": "@s","objective": "total_score"}}," 没能获得积分……"]
+execute if score #bonus_add_score mem matches ..-1 if score @s total_score matches 0 run tellraw @a [{"text":"","color":"red"},{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"white"}," 没能获得积分……"]
 execute if score #bonus_add_score mem matches ..-1 if score @s total_score matches 1.. run tellraw @a [{"text":"","color":"red"},{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"white"}," 的 ",{"score": {"name": "@s","objective": "total_score"}}," 积分惨遭清零……"]
 execute if score #bonus_add_score mem matches ..-1 run scoreboard players set @s total_score 0
 execute if score #bonus_add_score mem matches ..-1 run scoreboard players set @s total_score_disp 0

data/item/functions/shop/buy/031_apple.mcfunction

@@ -1,12 +1,12 @@
-# 生命果 (2g)
+# 金苹果 (2g)
 scoreboard players add @s shop_03_apple 0
 tag @s remove canbuy
 tag @s[scores={shop_03_apple=0,gold=18..}] add canbuy
 tellraw @s[scores={shop_03_apple=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
 tellraw @s[scores={shop_03_apple=0,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_03_apple=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"生命果","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"生命果","color":"green"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"金苹果","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"金苹果","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_03_apple 1
 scoreboard players remove @s[tag=canbuy] gold 18
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error

data/item/functions/shop/buy/032_apple.mcfunction

@@ -1,12 +1,12 @@
-# 附魔生命果 (4g)
+# 附魔金苹果 (4g)
 scoreboard players add @s shop_03_apple 0
 tag @s remove canbuy
 tag @s[scores={shop_03_apple=1,gold=36..}] add canbuy
 tellraw @s[scores={shop_03_apple=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
 tellraw @s[scores={shop_03_apple=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_03_apple=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"附魔生命果","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"附魔生命果","color":"green"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"附魔金苹果","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"附魔金苹果","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_03_apple 1
 scoreboard players remove @s[tag=canbuy] gold 36
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error

data/item/functions/shop/refresh_equip.mcfunction

@@ -16,8 +16,8 @@ give @s[scores={shop_02_arrow=3}] tipped_arrow{Potion:"minecraft:slowness"} 2
 # 03
 clear @s golden_apple
 clear @s enchanted_golden_apple
-give @s[scores={shop_03_apple=1}] golden_apple{display:{Lore:['{"text":"恢复 4 颗心或生命 +1","italic":false,"color":"gray"}'],Name:'{"text":"生命果","italic":false,"color":"aqua"}'}}
-give @s[scores={shop_03_apple=2}] enchanted_golden_apple{display:{Name:'{"text":"附魔生命果","italic":false,"color":"light_purple"}',Lore:['{"text":"恢复到满血或生命加倍","italic":false,"color":"gray"}']}}
+give @s[scores={shop_03_apple=1}] golden_apple{display:{Lore:['{"text":"在部分小游戏中食用能使生命 +1","italic":false,"color":"gray"}'],Name:'{"text":"金苹果","italic":false,"color":"aqua"}'}}
+give @s[scores={shop_03_apple=2}] enchanted_golden_apple{display:{Name:'{"text":"附魔金苹果","italic":false,"color":"light_purple"}',Lore:['{"text":"在部分小游戏中食用能使当前生命加倍","italic":false,"color":"gray"}']}}
 scoreboard players reset @s shop_03_apple
 
 # 04

data/item/functions/special/clear_apple_effect.mcfunction

@@ -0,0 +1,5 @@
+# 重置 buff
+effect clear @a[tag=consume_apple] absorption
+
+# 重置 tag
+tag @a[tag=consume_apple] remove consume_apple

data/item/functions/special/clear_effect.mcfunction

@@ -1,5 +0,0 @@
-# 重置buff
-execute as @a[tag=consume_apple] run function mini:main/give_effect
-
-# 重置 tag
-tag @a[tag=consume_apple] remove consume_apple

data/item/functions/special/clear_totem_effect.mcfunction

@@ -0,0 +1,5 @@
+# 重置 buff
+effect clear @a[tag=have_totem] absorption
+
+# 重置 tag
+tag @a[tag=have_totem] remove have_totem

data/item/functions/special/enchanted_apple.mcfunction

@@ -4,17 +4,13 @@ advancement revoke @s only item:special/consume_enchanted_apple
 # 计算生命值
 execute if score @s mini_heart matches 1.. run scoreboard players operation @s mini_heart += @s mini_heart
 execute if score @s mini_heart matches 1.. run function mini:main/player_max_health
-execute if score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了附魔生命果, 生命加倍!"]
+execute if score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了附魔金苹果, 生命加倍！"]
 
 # 无生命计数：恢复生命
-execute unless score @s mini_heart matches 1.. run effect give @s instant_health 1 10 true
-execute unless score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了附魔生命果, 生命恢复到满血!"]
-
-# 归还苹果
-#execute unless score @s mini_heart matches 1.. run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text":"你只能在存在生命计数的小游戏中食用生命果!","color":"aqua"}]
-#execute unless score @s mini_heart matches 1.. run give @s minecraft:enchanted_golden_apple{display:{Name:'{"text":"附魔生命果","italic":false}',Lore:['{"text":"恢复到满血或生命加倍","italic":false,"color":"gray"}']},bonus_new:0b,bonus_return:1b,is_bonus:1b,item_name:'{"text":"附魔生命果","color":"aqua"}'}
+execute unless score @s mini_heart matches 1.. run effect give @s instant_health 1 1 true
+execute unless score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了附魔金苹果！"]
 
 # $remove_resistance 信息在小游戏初始化时提供
 # 去除buff
-execute run tag @s add consume_apple
-schedule function item:special/clear_effect 2t replace
+tag @s add consume_apple
+schedule function item:special/clear_apple_effect 2t replace

data/item/functions/special/golden_apple.mcfunction

@@ -4,17 +4,13 @@ advancement revoke @s only item:special/consume_golden_apple
 # 有生命计数：增加生命数
 execute if score @s mini_heart matches 1.. run scoreboard players add @s mini_heart 1
 execute if score @s mini_heart matches 1.. run function mini:main/player_max_health
-execute if score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了生命果, 生命 +1!"]
+execute if score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了金苹果, 生命 +1！"]
 
 # 无生命计数：恢复生命
-execute unless score @s mini_heart matches 1.. run effect give @s instant_health 1 1 true
-execute unless score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了生命果, 生命恢复 4 颗心!"]
-
-## 归还苹果
-#execute unless score @s mini_heart matches 1.. run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text":"你只能在存在生命计数的小游戏中食用生命果!","color":"aqua"}]
-#execute unless score @s mini_heart matches 1.. run give @s minecraft:golden_apple{display:{Name:'{"text":"生命果","italic":false}',Lore:['{"text":"恢复 4 颗心或生命 +1","italic":false,"color":"gray"}']},bonus_new:0b,bonus_return:1b,is_bonus:1b,item_name:'{"text":"生命果","color":"green"}'}
+execute unless score @s mini_heart matches 1.. run effect give @s instant_health 1 0 true
+execute unless score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 食用了金苹果！"]
 
 # $remove_resistance 信息在小游戏初始化时提供
 # 去除buff
-execute run tag @s add consume_apple
-schedule function item:special/clear_effect 2t replace
+tag @s add consume_apple
+schedule function item:special/clear_apple_effect 2t replace

data/item/functions/special/totem.mcfunction

@@ -2,17 +2,13 @@
 advancement revoke @s only item:special/consume_totem
 
 # 有生命计数
-execute if score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 使用了不死图腾, 抵挡了一次死亡!"]
+execute if score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 使用了不死图腾, 抵挡了一次死亡！"]
 
-
-# 无生命计数：恢复所有生命
-execute unless score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 使用了不死图腾, 并恢复到了满血!"]
-
-## 归还苹果
-#execute unless score @s mini_heart matches 1.. run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text":"你只能在存在生命计数的小游戏中食用生命果!","color":"aqua"}]
-#execute unless score @s mini_heart matches 1.. run give @s minecraft:golden_apple{display:{Name:'{"text":"生命果","italic":false}',Lore:['{"text":"恢复 4 颗心或生命 +1","italic":false,"color":"gray"}']},bonus_new:0b,bonus_return:1b,is_bonus:1b,item_name:'{"text":"生命果","color":"green"}'}
+# 无生命计数
+execute unless score @s mini_heart matches 1.. run effect give @s instant_health 1 0 true
+execute unless score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 使用了不死图腾！"]
 
 # $remove_resistance 信息在小游戏初始化时提供
 # 去除buff
 execute unless score @s mini_heart matches 1.. run tag @s add have_totem
-schedule function mini:main/lose_heart_effect 1t
+schedule function mini:main/clear_totem_effect 2t replace

data/item/loot_tables/item/blue.json

@@ -70,7 +70,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"附魔生命果\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复到满血或生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔生命果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+                "tag": "{item_name:'{\"text\":\"附魔金苹果\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"在部分小游戏中食用能使当前生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔金苹果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
             }
         ]
     },
@@ -81,7 +81,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"生命果 + 9 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"white\"}'},bonus_gold:9}"
+                "tag": "{item_name:'{\"text\":\"金苹果 + 9 金粒\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"在部分小游戏中食用能使生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"金苹果\",\"italic\":false,\"color\":\"white\"}'},bonus_gold:9}"
             }
         ]
     },

data/item/loot_tables/item/green.json

@@ -184,7 +184,7 @@
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"生命果 x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"white\"}'}}"
+                "tag": "{item_name:'{\"text\":\"金苹果 x2\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"在部分小游戏中食用能使生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"金苹果\",\"italic\":false,\"color\":\"white\"}'}}"
             }
         ]
     },

data/item/loot_tables/item/purple.json

@@ -55,7 +55,7 @@
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"附魔生命果 x2\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复到满血或生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔生命果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+                "tag": "{item_name:'{\"text\":\"附魔金苹果 x2\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"在部分小游戏中食用能使当前生命加倍\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"附魔金苹果\",\"italic\":false,\"color\":\"light_purple\"}'}}"
             }
         ]
     },

data/item/loot_tables/item/white.json

@@ -203,7 +203,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"生命果\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"恢复 4 颗心或生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"生命果\",\"italic\":false,\"color\":\"white\"}'}}"
+                "tag": "{item_name:'{\"text\":\"金苹果\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Lore:['{\"text\":\"在部分小游戏中食用能使生命 +1\",\"italic\":false,\"color\":\"gray\"}'],Name:'{\"text\":\"金苹果\",\"italic\":false,\"color\":\"white\"}'}}"
             }
         ]
     },

data/ltw/functions/main/game_end.mcfunction

@@ -5,7 +5,6 @@ tag @a remove total_rank1
 tag @a remove total_rank2
 tag @a remove total_rank3
 tag @a remove total_rankl
-tag @a remove total_rankx
 # 1
 function ltw:main/get_max_score
 execute as @a if score @s total_score = #score_max mem run tag @s add total_rank1
@@ -23,42 +22,12 @@ scoreboard players set #score_min mem 2147483647
 scoreboard players operation #score_min mem < @a[team=playing] total_score
 execute as @a if score @s total_score = #score_min mem run tag @s add total_rankl
 # 没有名次
-tag @a[team=playing,tag=!total_rank1,tag=!total_rank2,tag=!total_rank3] add total_rankx
+tag @a[team=playing,tag=!total_rank1,tag=!total_rank2,tag=!total_rank3] add total_rankl
 
 # 给予进度
 scoreboard players add @a[team=playing] stat_total 1
 scoreboard players add @a[tag=total_rank1] stat_win 1
 
-# 计算金粒奖励
-scoreboard players set #total_gold mem 0
-execute as @a[team=playing] run scoreboard players add #total_gold mem 300
-# 计算总权重与单份奖励
-scoreboard players set #total_weight mem 0
-execute as @a[tag=total_rank1] run scoreboard players add #total_weight mem 4
-execute as @a[tag=total_rank2] run scoreboard players add #total_weight mem 3
-execute as @a[tag=total_rank3] run scoreboard players add #total_weight mem 2
-execute as @a[tag=total_rankx] run scoreboard players add #total_weight mem 1
-scoreboard players operation #total_gold mem /= #total_weight mem
-# 计算名次奖励
-scoreboard players set #rank1_gold mem 4
-scoreboard players operation #rank1_gold mem *= #total_gold mem
-scoreboard players operation #rank1_gold mem /= #100 mem
-scoreboard players set #rank2_gold mem 3
-scoreboard players operation #rank2_gold mem *= #total_gold mem
-scoreboard players operation #rank2_gold mem /= #100 mem
-scoreboard players set #rank3_gold mem 2
-scoreboard players operation #rank3_gold mem *= #total_gold mem
-scoreboard players operation #rank3_gold mem /= #100 mem
-scoreboard players set #rankl_gold mem 1
-scoreboard players operation #rankl_gold mem *= #total_gold mem
-scoreboard players operation #rankl_gold mem /= #100 mem
-# 如果因为掉线强制结束则无名次奖励
-execute store result score #count mem if entity @a[team=playing]
-execute if score #count mem matches ..2 run scoreboard players set #rank1_gold mem 0
-execute if score #count mem matches ..2 run scoreboard players set #rank2_gold mem 0
-execute if score #count mem matches ..2 run scoreboard players set #rank3_gold mem 0
-execute if score #count mem matches ..2 run scoreboard players set #rankl_gold mem 0
-
 # 显示排名
 tellraw @a ["",{"text":"\n------  全场游戏结束！ ------\n","color":"light_purple","bold":true}]
 tellraw @a ["  ",{"text": "第一名 >  ","color":"red"},{"selector": "@a[tag=total_rank1]","color":"red"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":")","color":"gray"}]
@@ -77,17 +46,13 @@ tellraw @a[team=playing,scores={gold_extra=1..}] [" 在游戏过程中，你拿
 # 局中绿宝石
 tellraw @a[team=playing,scores={green_extra=1..}] [" 由于达成了进度，你得到了 ",{"score":{"name": "*","objective": "green_extra"},"color":"green"},{"text": " 绿宝石","color":"green"}," 完成奖励！"]
 
-# 名次金粒奖励
-scoreboard players set @a temp 0
-execute as @a[tag=total_rank1] run scoreboard players operation @s temp = #rank1_gold mem
-execute as @a[tag=total_rank2] run scoreboard players operation @s temp = #rank2_gold mem
-execute as @a[tag=total_rank3] run scoreboard players operation @s temp = #rank3_gold mem
-execute as @a[tag=total_rankx] run scoreboard players operation @s temp = #rankl_gold mem
-execute as @a run scoreboard players operation @s gold += @s temp
-execute as @a run scoreboard players operation @s gold_total += @s temp
-tellraw @a[team=playing,tag=!total_rankx,tag=!total_rankl,scores={temp=1..}] [" 最后，由于你的出色名次，还获得了 ",{"score":{"name": "*","objective": "temp"},"color":"gold"},{"text": " 金粒","color":"gold"}," 奖励！"]
-tellraw @a[team=playing,tag=!total_rankx,tag=total_rankl,scores={temp=1..}] [" 不要气馁，收下 ",{"score":{"name": "*","objective": "temp"},"color":"gold"},{"text": " 金粒","color":"gold"}," 奖励，继续加油吧！"]
-tellraw @a[team=playing,tag=total_rankx,scores={temp=1..}] [" 不要气馁，收下 ",{"score":{"name": "*","objective": "temp"},"color":"gold"},{"text": " 金粒","color":"gold"}," 奖励，继续加油吧！"]
+# 如果因为掉线强制结束则无安慰奖
+execute store result score #count mem if entity @a[team=playing]
+execute if score #count mem matches ..2 run tag @a remove total_rankl
+# 安慰奖
+execute as @a[tag=total_rankl] run scoreboard players add @s gold 5
+execute as @a[tag=total_rankl] run scoreboard players add @s gold_total 5
+tellraw @a[tag=total_rankl] [" 不要气馁，收下 ",{"text": "5 金粒","color":"gold"}," 奖励，继续加油吧！"]
 
 # 奖励结束
 tellraw @a[team=playing] ""

data/ltw/functions/main/player_enter.mcfunction

@@ -36,4 +36,4 @@ function lib:bossbar/show
 # 规则应该尽量简单易学
 #    除非必要，不要增加单个游戏的规则复杂度，这会提高学习成本，让新人难以入门
 # 在制作时考虑给道具留下发挥空间
-#    玩家有远程攻击，有鞘翅，有生命果，有护甲和剑，有击退棒，让它们可以得到应用
+#    玩家有远程攻击，有鞘翅，有金苹果，有护甲和剑，有击退棒，让它们可以得到应用

data/ltw/functions/state/0/summon_entity.mcfunction

@@ -12,7 +12,7 @@ execute unless entity @e[type=piglin,tag=shop_piglin_10,tag=lobby_entity] run su
 
 # 召唤粒子房实体
 execute unless entity @e[type=villager,tag=shop_particle_1,tag=lobby_entity] run summon minecraft:villager -23 20 -73 {Tags:["lobby_entity","shop_particle_1"],CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
-execute unless entity @e[type=villager,tag=shop_particle_2,tag=lobby_entity] run summon minecraft:villager -17 20 -76 {Tags:["lobby_entity","shop_particle_2"],CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
+execute unless entity @e[type=villager,tag=shop_particle_2,tag=lobby_entity] run summon minecraft:villager -17 20 -76 {Tags:["lobby_entity","shop_particle_2"]}
 execute unless entity @e[type=armor_stand,tag=show_particle_1,tag=lobby_entity] run summon minecraft:armor_stand -19 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_1","lobby_entity"]}
 execute unless entity @e[type=armor_stand,tag=show_particle_2,tag=lobby_entity] run summon minecraft:armor_stand -18 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_2","lobby_entity"]}
 execute unless entity @e[type=armor_stand,tag=show_particle_3,tag=lobby_entity] run summon minecraft:armor_stand -17 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_3","lobby_entity"]}

data/ltw/functions/state/7/continue_gameparty.mcfunction

@@ -3,5 +3,7 @@ scoreboard players set $bossbar_type mem 0
 function lib:bossbar/show
 
 # 继续下一轮小游戏
+scoreboard players set $countdown mem -1
+gamemode spectator @a[team=!debugging]
 scoreboard players add $round mem 1
 schedule function ltw:state/3/state_enter 2t replace

data/ltw/functions/state/7/next.mcfunction

@@ -23,14 +23,6 @@ execute unless entity @a[tag=new_selector] if score $round mem matches ..4 run f
 
 # 初始化倒计时与 HUD
 scoreboard players set $countdown mem 10
-# scoreboard players set $bossbar_color mem 0
-# scoreboard players set @a[tag=!new_selector] bossbar_color 2
-# scoreboard players set @a[tag=new_selector] bossbar_color 4
-# scoreboard players set $countdown_max mem 10
-# scoreboard players set $bossbar_type mem 2
-# function lib:bossbar/show
-# bossbar set mini:yellow name "等待他人选择"
-# bossbar set mini:blue name "剩余时间"
 
 # 播放音效
 execute as @a[tag=new_selector] at @s run function lib:sounds/hit

data/mini/functions/colormatch/tick20.mcfunction

@@ -6,8 +6,8 @@ execute if entity @e[tag=bonus_item,x=1000,y=0,z=4000,dx=100,dy=1000,dz=100] run
 
 # 如果没有物品，则计算冷却
 execute if score #new_item mem matches 0 run scoreboard players add $new_item_cd mem 1
-# 已经超过 12s 冷却时间
-execute if score $new_item_cd mem matches ..11 run scoreboard players set #new_item mem 1
+# 已经超过 15s 冷却时间
+execute if score $new_item_cd mem matches ..14 run scoreboard players set #new_item mem 1
 
 # 存活玩家数（$player_alive）>= 3
 execute if score $player_alive mem matches ..2 run scoreboard players set #new_item mem 1

data/mini/functions/iron/player_death.mcfunction

@@ -9,25 +9,25 @@ effect give @s blindness 3 0 true
 # 获取玩家死亡位置
 kill @e[type=armor_stand,tag=dead_marker]
 summon armor_stand 1000 0 5000 {Marker:1b,Invisible:1b,Invulnerable:1b,Small:1b,NoGravity:1b,Tags:["dead_marker"]}
-execute store result entity @e[type=armor_stand,tag=dead_marker,limit=1] Pos[0] double 1 run scoreboard players get @s posX
-execute store result entity @e[type=armor_stand,tag=dead_marker,limit=1] Pos[1] double 1 run scoreboard players get @s posY
-execute store result entity @e[type=armor_stand,tag=dead_marker,limit=1] Pos[2] double 1 run scoreboard players get @s posZ
+execute store result entity @e[type=armor_stand,tag=dead_marker,limit=1] Pos[0] double 0.1 run scoreboard players get @s posX
+execute store result entity @e[type=armor_stand,tag=dead_marker,limit=1] Pos[1] double 0.1 run scoreboard players get @s posY
+execute store result entity @e[type=armor_stand,tag=dead_marker,limit=1] Pos[2] double 0.1 run scoreboard players get @s posZ
 # 生成铁锭物品
 execute store result score #iron_count temp run clear @s iron_ingot
 scoreboard players add #iron_count temp 2
-execute if score #iron_count temp matches 3.. at @e[type=armor_stand,tag=dead_marker,limit=1] run summon item ~ ~ ~ {Tags:["temp_iron"],Item:{id:"minecraft:iron_ingot",Count:1b},Glowing:1b}
+execute if score #iron_count temp matches 3.. at @e[type=armor_stand,tag=dead_marker,limit=1] run summon item ~ ~0.2 ~ {Tags:["temp_iron"],Item:{id:"minecraft:iron_ingot",Count:1b},Glowing:1b}
 execute as @e[type=item,tag=temp_iron,limit=1] store result entity @s Item.Count byte 0.33334 run scoreboard players get #iron_count temp
 tag @e[type=item,tag=temp_iron,limit=1] remove temp_iron
 # 生成生铁物品
 execute store result score #raw_iron_count temp run clear @s raw_iron
 scoreboard players add #raw_iron_count temp 2
-execute if score #raw_iron_count temp matches 3.. at @e[type=armor_stand,tag=dead_marker,limit=1] run summon item ~ ~ ~ {Tags:["temp_raw_iron"],Item:{id:"minecraft:raw_iron",Count:1b},Glowing:1b}
+execute if score #raw_iron_count temp matches 3.. at @e[type=armor_stand,tag=dead_marker,limit=1] run summon item ~-0.1 ~0.2 ~0.1 {Tags:["temp_raw_iron"],Item:{id:"minecraft:raw_iron",Count:1b},Glowing:1b}
 execute as @e[type=item,tag=temp_raw_iron,limit=1] store result entity @s Item.Count byte 0.33334 run scoreboard players get #raw_iron_count temp
 tag @e[type=item,tag=temp_raw_iron,limit=1] remove temp_raw_iron
 # 生成圆石物品
 execute store result score #cobblestone_count temp run clear @s cobblestone
 scoreboard players add #cobblestone_count temp 2
-execute if score #cobblestone_count temp matches 3.. at @e[type=armor_stand,tag=dead_marker,limit=1] run summon item ~ ~ ~ {Tags:["temp_cobblestone"],Item:{id:"minecraft:cobblestone",Count:1b},Glowing:1b}
+execute if score #cobblestone_count temp matches 3.. at @e[type=armor_stand,tag=dead_marker,limit=1] run summon item ~0.1 ~0.2 ~0.1 {Tags:["temp_cobblestone"],Item:{id:"minecraft:cobblestone",Count:1b}}
 execute as @e[type=item,tag=temp_cobblestone,limit=1] store result entity @s Item.Count byte 0.33334 run scoreboard players get #cobblestone_count temp
 tag @e[type=item,tag=temp_cobblestone,limit=1] remove temp_cobblestone
 # 随机槽位掉落

data/mini/functions/iron/tick2.mcfunction

@@ -1,3 +1,3 @@
-execute as @a[team=playing] store result score @s posX run data get entity @s Pos[0]
-execute as @a[team=playing] store result score @s posY run data get entity @s Pos[1]
-execute as @a[team=playing] store result score @s posZ run data get entity @s Pos[2]
+execute as @a[team=playing] store result score @s posX run data get entity @s Pos[0] 10
+execute as @a[team=playing] store result score @s posY run data get entity @s Pos[1] 10
+execute as @a[team=playing] store result score @s posZ run data get entity @s Pos[2] 10

data/mini/functions/iron/tick5.mcfunction

@@ -7,3 +7,4 @@ execute if score $countdown mem matches ..60 run effect clear @a[team=playing,ta
 
 # 铁锭发光
 execute as @e[type=item,nbt={Item:{id:"minecraft:iron_ingot"}}] run data modify entity @s Glowing set value 1b
+execute as @e[type=item,nbt={Item:{id:"minecraft:raw_iron"}}] run data modify entity @s Glowing set value 1b

data/mini/functions/main/lose_heart_effect.mcfunction

@@ -1,4 +0,0 @@
-execute as @a[tag=have_totem] run function mini:main/give_effect
-execute as @a[tag=have_totem] run effect give @s instant_health 1 5 true
-
-tag @a[tag=have_totem] remove have_totem

data/mini/functions/main/player_lose_heart.mcfunction

@@ -5,8 +5,6 @@ execute if score @s mini_heart matches 1 if entity @s[nbt={SelectedItem:{id:"min
 execute if score @s mini_heart matches 1 if entity @s[nbt={Inventory:[{Slot:-106b,id:"minecraft:totem_of_undying"}]}] run tag @s add have_totem
 execute if entity @s[tag=have_totem] run effect clear @s resistance
 execute if entity @s[tag=have_totem] run effect give @s instant_damage 1 10 true
-# schedule function mini:main/lose_heart_effect 1t 
-# 现在触发图腾会默认清除效果了
 
 # 减少命
 execute if score @s[tag=!have_totem] mini_heart matches 1.. run scoreboard players remove @s mini_heart 1