aqupa 4 years ago
parent
commit
10cad97430

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

@@ -56,11 +56,14 @@ scoreboard objectives remove effect_floating
 scoreboard objectives add effect_floating dummy "悬浮计时"
 scoreboard objectives remove game_id
 scoreboard objectives add game_id dummy "游戏编号"
+scoreboard objectives remove round_id
+scoreboard objectives add round_id dummy "小游戏编号"
 scoreboard objectives remove player_id
 scoreboard objectives add player_id dummy "玩家编号"
 scoreboard objectives remove music_time
 scoreboard objectives add music_time dummy "BGM 时间"
 scoreboard players set $ game_id 0
+scoreboard players set $ round_id 0
 
 # 商店系统记分板
 scoreboard objectives add gold dummy "金粒"

+ 1 - 0
data/ltw/functions/state/3/state_enter.mcfunction

@@ -37,6 +37,7 @@ execute if score $round mem matches 5 if score $random mem matches 0 run scorebo
 execute if score $round mem matches 5 if score $random mem matches 1 run scoreboard players set $mini_type mem 102
 
 # 初始化小游戏
+scoreboard players add $ round_id 1
 function mini:main/game_init
 
 # 清理残留实体

+ 5 - 4
data/mini/functions/main/kill_remaining_entity.mcfunction

@@ -1,7 +1,8 @@
-# 用game_id标记所有玩家以外的实体,并清除遗留实体
+# 用 round_id 标记所有玩家以外的实体,并清除遗留实体
 
-scoreboard players add @e[type=!player] game_id 0
-scoreboard players operation @e[type=!player,scores={game_id=0}] game_id = $ game_id
+scoreboard players add @e[type=!player] round_id 0
+scoreboard players operation @e[type=!player,scores={round_id=0}] round_id = $ round_id
 scoreboard players set item_test mem 0
-execute store result score item_test mem as @e[type=!player] unless score @s game_id = $ game_id run tp @s ~ ~-1000 ~
+execute as @e[type=!player] unless score @s round_id = $ round_id run scoreboard players add item_test mem 1
+execute as @e[type=!player] unless score @s round_id = $ round_id run tp @s ~ ~-1000 ~
 execute if score item_test mem matches 1.. run tellraw @a ["清理了",{"score":{"name": "item_test","objective": "mem"}},"个实体"]