LTCatt 6 лет назад
Родитель
Сommit
3ea53fe1ce

+ 8 - 1
data/mini/functions/main/game_start.mcfunction

@@ -2,15 +2,22 @@
 # HUD
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay list total_score_disp
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay belowName total_score_disp
+execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay sidebar total_score
 execute if score $mini_type mem matches 2 run scoreboard objectives setdisplay list total_score_disp
 execute if score $mini_type mem matches 2 run scoreboard objectives setdisplay belowName total_score_disp
+execute if score $mini_type mem matches 2 run scoreboard objectives setdisplay sidebar total_score
 execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay list mini_heart_disp
 execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay belowName mini_heart
+execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay sidebar total_score
 execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay list mini_heart_disp
 execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay belowName mini_heart
+execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay sidebar total_score
 execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay list health_disp
 execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay belowName health_disp
-scoreboard objectives setdisplay sidebar total_score
+execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay sidebar total_score
+execute if score $mini_type mem matches 6 run scoreboard objectives setdisplay list health_disp
+execute if score $mini_type mem matches 6 run scoreboard objectives setdisplay belowName kill_phantom
+execute if score $mini_type mem matches 6 run scoreboard objectives setdisplay sidebar kill_phantom
 
 # 调用其他模块
 execute if score $mini_type mem matches 1 run function mini:parkour/game_start

+ 1 - 1
data/mini/functions/phantom/game/summon2.mcfunction

@@ -1,5 +1,5 @@
 
 execute as @e[tag=new_phantom] at @s run tp @s ~ 35 ~
-attribute @e[tag=new_phantom,limit=1] generic.max_health base set 6
+attribute @e[tag=new_phantom,limit=1] generic.max_health base set 4
 attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 1
 tag @e[tag=new_phantom] remove new_phantom

+ 1 - 1
data/mini/functions/phantom/game/use_trident.mcfunction

@@ -1,6 +1,6 @@
 # 设置玩家分数
 scoreboard players set @s countdown_fast 25
-scoreboard players reset @s useTrident
+scoreboard players reset @s use_trident
 
 # 清除三叉戟以防bug
 clear @s trident{GameItem:1b}

+ 2 - 1
data/mini/functions/phantom/game_start.mcfunction

@@ -1,2 +1,3 @@
 gamerule doDaylightCycle true
-scoreboard players set $countdown mem 110
+scoreboard players set $countdown mem 110
+scoreboard players reset * kill_phantom

+ 4 - 2
data/mini/functions/phantom/init.mcfunction

@@ -1,3 +1,5 @@
 # 重置计分板
-scoreboard objectives remove useTrident
-scoreboard objectives add useTrident minecraft.used:trident "使用三叉戟"
+scoreboard objectives remove use_trident
+scoreboard objectives add use_trident minecraft.used:trident "使用三叉戟"
+scoreboard objectives remove kill_phantom
+scoreboard objectives add kill_phantom killed:phantom "幻翼击杀数"

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

@@ -10,7 +10,8 @@ effect give @s instant_health 10 0 true
 gamerule naturalRegeneration false
 
 # 计分板重置
-scoreboard players reset @s useTrident
+scoreboard players reset @s kill_phantom
+scoreboard players reset @s use_trident
 scoreboard players reset @s countdown
 
 # 传送玩家

+ 1 - 1
data/mini/functions/phantom/tick2.mcfunction

@@ -1,5 +1,5 @@
 # 使用三叉戟调用函数
-execute as @a[tag=mini_running] if score @s useTrident matches 1.. run function mini:phantom/game/use_trident
+execute as @a[tag=mini_running] if score @s use_trident matches 1.. run function mini:phantom/game/use_trident
 
 # 给予三叉戟
 execute as @a[tag=mini_running] unless data entity @s Inventory[{id:"minecraft:trident",tag:{GameItem:1b}}] unless score @s countdown_fast matches 1.. run function mini:phantom/game/give_trident