LTCatt преди 6 години
родител
ревизия
83eb6f95bd

+ 0 - 2
data/item/functions/special/enchanted_apple.mcfunction

@@ -18,5 +18,3 @@ execute unless score @s mini_heart matches 1.. run tellraw @a ["",{"text": ">> "
 # 去除buff
 # 去除buff
 execute run tag @s add consume_apple
 execute run tag @s add consume_apple
 schedule function item:special/clear_effect 1t replace
 schedule function item:special/clear_effect 1t replace
-
-# TODO : [LTCat] 让 list 显示生命

+ 1 - 0
data/ltw/functions/init.mcfunction

@@ -29,6 +29,7 @@ scoreboard objectives remove health
 scoreboard objectives add health health "生命值"
 scoreboard objectives add health health "生命值"
 scoreboard objectives remove health_disp
 scoreboard objectives remove health_disp
 scoreboard objectives add health_disp dummy "生命值"
 scoreboard objectives add health_disp dummy "生命值"
+scoreboard objectives modify health_disp rendertype hearts
 scoreboard objectives remove death
 scoreboard objectives remove death
 scoreboard objectives add death deathCount "死亡触发"
 scoreboard objectives add death deathCount "死亡触发"
 scoreboard objectives remove mem
 scoreboard objectives remove mem

+ 6 - 6
data/mini/functions/main/game_start.mcfunction

@@ -1,16 +1,16 @@
 
 
 # HUD
 # HUD
-execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay sidebar total_score
+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 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 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 belowName total_score_disp
-execute if score $mini_type mem matches 3 run scoreboard objectives setdisplay sidebar mini_heart
+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 belowName mini_heart
-execute if score $mini_type mem matches 4 run scoreboard objectives setdisplay sidebar mini_heart
+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 belowName mini_heart
-execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay sidebar health_disp
+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
 execute if score $mini_type mem matches 5 run scoreboard objectives setdisplay belowName health_disp
-scoreboard objectives setdisplay list total_score_disp
+scoreboard objectives setdisplay sidebar total_score
 
 
 # 调用其他模块
 # 调用其他模块
 execute if score $mini_type mem matches 2 run function mini:tntrun/game_start
 execute if score $mini_type mem matches 2 run function mini:tntrun/game_start

+ 3 - 1
data/mini/functions/main/tick5.mcfunction

@@ -7,4 +7,6 @@ execute if score $mini_type mem matches 3 run function mini:hotpm/tick5
 # 同步生命值
 # 同步生命值
 scoreboard players reset * health_disp
 scoreboard players reset * health_disp
 scoreboard players set @a[gamemode=!spectator] health_disp 20
 scoreboard players set @a[gamemode=!spectator] health_disp 20
-execute as @a[gamemode=!spectator,scores={health=1..}] run scoreboard players operation @s health_disp = @s health
+execute as @a[gamemode=!spectator,scores={health=1..}] run scoreboard players operation @s health_disp = @s health
+execute as @a run scoreboard players operation @s mini_heart_disp = @s mini_heart
+execute as @a run scoreboard players operation @s mini_heart_disp += @s mini_heart

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

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run spectate
 execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run tp @s 1008.5 8.00 1008.5
+execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run tp @s 1027.56 18.03 1046.89 13.48 4.84