2
0
LTCatt 6 жил өмнө
parent
commit
c6b1ca3848

+ 7 - 5
data/item/functions/bonus_item/add_score.mcfunction

@@ -24,13 +24,15 @@ tag @a remove highest
 tag @a remove may_highest
 execute as @a if score @s total_score = #score_max mem run tag @s add may_highest
 execute at @s run tag @a[tag=may_highest,limit=1,sort=furthest] add highest
-execute if score #bonus_add_score mem matches 200 if entity @s[tag=highest] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 试图偷取自己的分数……"]
-execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@a[tag=highest,limit=1,sort=furthest]","color":"red"}," 被偷取了 ",{"text": "1 分","color":"red"},", 当前共有 ",{"score": {"name": "@a[tag=highest,limit=1,sort=furthest]","objective": "total_score"}}, " 分"]
-execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"text": "1 分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
+
 execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score 1
 execute if score #bonus_add_score mem matches 200 run scoreboard players add @s total_score_disp 1
-execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score 1
-execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest,limit=1,sort=furthest] total_score_disp 1
+execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest] total_score 1
+execute if score #bonus_add_score mem matches 200 run scoreboard players remove @a[tag=highest] total_score_disp 1
+
+execute if score #bonus_add_score mem matches 200 if entity @s[tag=highest] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 试图偷取自己的分数……"]
+execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@p[tag=highestt]","color":"red"}," 被偷取了 ",{"text": "1 分","color":"red"},", 当前共有 ",{"score": {"name": "@p[tag=highest]","objective": "total_score"}}, " 分"]
+execute if score #bonus_add_score mem matches 200 if entity @s[tag=!highest] run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 偷取了 ",{"text": "1 分","color":"green"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 分"]
 
 # 300:金粒 +1
 execute if score #bonus_add_score mem matches 300 run scoreboard players add @s gold 1

+ 0 - 1
data/ltw/functions/main/game_end.mcfunction

@@ -65,5 +65,4 @@ schedule function ltw:state/0/state_enter 2t replace
 execute as @a at @s run function lib:sounds/theend
 forceload remove all
 
-# FIXME : <! 紧急> 土豆消失了
 # FIXME : 新加入游戏的玩家会显示幻翼击杀数和得分

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

@@ -1,2 +1,2 @@
 # 强制开门倒计时
-scoreboard players set $countdown mem 90
+scoreboard players set $countdown mem 80

+ 1 - 3
data/mini/functions/parkour/player_intro.mcfunction

@@ -4,6 +4,4 @@ tellraw @s ["",{"text":"\n >> 旅途 >>\n\n","color":"gold","bold":true}," 沿
 tellraw @s ["",{"text": " <完成制> ","color":"red","bold": true}, {"text":"根据完成跑酷的速度快慢决定排名。","color":"gray"}]
 tellraw @s ["",{"text": " <和平环境> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家。","color":"gray"}]
 tellraw @s ["",{"text": " <额外道具> ","color":"aqua","bold": true}, {"text":"小游戏地图中存在 1 个蓝色道具与 1 个白色道具。","color":"gray"}]
-tellraw @s ""
-
-effect give @s night_vision 1000000 0 true
+tellraw @s ""

+ 3 - 2
data/mini/functions/parkour/tick20.mcfunction

@@ -9,8 +9,9 @@ function mini:main/update_player_count
 execute store result score #arrived mem if entity @a[x=1014.0,y=20.0,z=1055.0,dx=4,dy=4,dz=4,tag=mini_running,tag=!watcher,scores={mini_score=-10..}]
 scoreboard players operation #not_arrive mem = $player_alive mem
 scoreboard players operation #not_arrive mem -= #arrived mem
-execute if score #not_arrive mem matches 0 run scoreboard players set $countdown mem 0
+execute if score #not_arrive mem matches 0 if score $parkour_door mem matches 0 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"text": "众人合力推开了大门!","color":"green"}]
+execute if score #not_arrive mem matches 0 if score $parkour_door mem matches 0 run function mini:parkour/game/open_the_door
 
-# 强制开门:倒计时 90s 触发
+# 强制开门:倒计时 80s 触发
 execute if score $countdown mem matches 0 if score $parkour_door mem matches 0 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"text": "一股神秘的力量推开了大门!","color":"green"}]
 execute if score $countdown mem matches 0 if score $parkour_door mem matches 0 run function mini:parkour/game/open_the_door