龙腾猫跃 3 anni fa
parent
commit
2e71a74434

+ 1 - 0
data/item/functions/bonus_item/call_each.mcfunction

@@ -34,6 +34,7 @@ execute if data storage item:bonus item.tag.bonus_stole_score run function item:
 execute if data storage item:bonus item.tag.bonus_gold run function item:bonus_item/gold
 
 # 执行特定函数
+execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/pickup
 execute if score $state mem matches 7 run function item:bonus_item/pickup_1
 
 # 处理下一个

+ 1 - 0
data/item/functions/special/clear_totem_effect.mcfunction

@@ -1,5 +1,6 @@
 # 重置 buff
 effect clear @a[tag=have_totem] absorption
+execute as @a[tag=have_totem] at @s run function mini:main/give_effect
 
 # 重置 tag
 tag @a[tag=have_totem] remove have_totem

+ 0 - 1
data/mini/functions/ass/give_effect.mcfunction

@@ -1,5 +1,4 @@
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s resistance 1000000 2 true
 effect give @s night_vision 1000000 0 true

+ 1 - 0
data/mini/functions/ass/player_enter.mcfunction

@@ -4,6 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 状态效果
+effect clear @s
 function mini:ass/give_effect
 
 # 设置玩家生命

+ 0 - 1
data/mini/functions/colormatch/give_effect.mcfunction

@@ -1,5 +1,4 @@
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true

+ 1 - 0
data/mini/functions/colormatch/player_enter.mcfunction

@@ -4,6 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 给予状态效果
+effect clear @s
 function mini:colormatch/give_effect
 
 # 设置玩家生命

+ 0 - 2
data/mini/functions/hotpm/give_effect.mcfunction

@@ -1,6 +1,4 @@
-
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true

+ 1 - 0
data/mini/functions/hotpm/player_enter.mcfunction

@@ -4,6 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 给予状态效果
+effect clear @s
 function mini:hotpm/give_effect
 
 # 设置玩家生命

+ 1 - 0
data/mini/functions/iron/game/respawn.mcfunction

@@ -1,5 +1,6 @@
 
 # 给予状态效果
+effect clear @s
 function mini:iron/give_effect
 effect give @s slow_falling 4
 effect give @s weakness 5 10 true

+ 0 - 1
data/mini/functions/iron/give_effect.mcfunction

@@ -1,5 +1,4 @@
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s haste 1000000 1 true

+ 0 - 2
data/mini/functions/parkour/give_effect.mcfunction

@@ -1,5 +1,3 @@
-
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s resistance 1000000 4 true

+ 2 - 0
data/mini/functions/parkour/pickup.mcfunction

@@ -0,0 +1,2 @@
+# 如果到达人数不足,捡到最多宝藏的玩家获胜
+scoreboard players add @s mini_score 1

+ 1 - 0
data/mini/functions/parkour/player_enter.mcfunction

@@ -4,6 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 给予状态效果
+effect clear @s
 function mini:parkour/give_effect
 
 # 设置玩家生命

+ 1 - 1
data/mini/functions/parkour/player_finished.mcfunction

@@ -20,4 +20,4 @@ execute if entity @s[tag=!rejoining] if score $player_finish mem matches ..2 run
 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
+scoreboard players add @a[tag=!mini_running] mini_score 100

+ 0 - 2
data/mini/functions/phantom/give_effect.mcfunction

@@ -1,4 +1,2 @@
-
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true

+ 1 - 0
data/mini/functions/phantom/player_enter.mcfunction

@@ -4,6 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 给予状态效果
+effect clear @s
 function mini:phantom/give_effect
 
 # 设置玩家生命

+ 0 - 2
data/mini/functions/tntrun/give_effect.mcfunction

@@ -1,6 +1,4 @@
-
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s resistance 1000000 4 true
 effect give @s night_vision 1000000 0 true

+ 1 - 0
data/mini/functions/tntrun/player_enter.mcfunction

@@ -4,6 +4,7 @@ title @s clear
 title @s actionbar ""
 
 # 给予状态效果
+effect clear @s
 function mini:tntrun/give_effect
 
 # 设置玩家生命

+ 1 - 0
data/mini/functions/trade/game/respawn.mcfunction

@@ -1,5 +1,6 @@
 
 # 给予状态效果
+effect clear @s
 function mini:trade/give_effect
 effect give @s slow_falling 4
 effect give @s weakness 5 10 true

+ 0 - 2
data/mini/functions/trade/give_effect.mcfunction

@@ -1,6 +1,4 @@
-
 # 状态效果
-effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s night_vision 1000000 0 true
 effect give @s haste 1000000 1 true