新的小游戏结束结算

data/item/loot_tables/score/purple.json

@@ -37,11 +37,11 @@
     "functions": [
         {
             "function": "minecraft:set_count",
-            "count": 6
+            "count": 5
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"6 积分 + 6 金粒\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":6,\"bonus_gold\":6}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"5 积分 + 5 金粒\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_add_score\":5,\"bonus_gold\":5}"
         }
     ]
 },

data/ltw/functions/main/game_end.mcfunction

@@ -63,10 +63,10 @@ execute if score #count mem matches ..2 run scoreboard players set #rank3_gold m
 execute if score #count mem matches ..2 run scoreboard players set #rankl_gold mem 0
 
 # 显示排名
-tellraw @a ["",{"text":"\n------  全部游戏结束！ ------\n","color":"light_purple","bold":true}]
-tellraw @a ["  ",{"text": "第一名 - ","color":"red"},{"selector": "@a[tag=total_rank1]","color":"red"},{"text":" （","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
-execute if entity @a[tag=total_rank2] run tellraw @a ["  ",{"text": "第二名 - ","color":"gold"},{"selector": "@a[tag=total_rank2]","color":"gold"},{"text":" （","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
-execute if entity @a[tag=total_rank3] run tellraw @a ["  ",{"text": "第三名 - ","color":"yellow"},{"selector": "@a[tag=total_rank3]","color":"yellow"},{"text":" （","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
+tellraw @a ["",{"text":"\n------  全场游戏结束！ ------\n","color":"light_purple","bold":true}]
+tellraw @a ["  ",{"text": "第一名 >  ","color":"red"},{"selector": "@a[tag=total_rank1]","color":"red"},{"text":"（","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
+execute if entity @a[tag=total_rank2] run tellraw @a ["  ",{"text": "第二名 >  ","color":"gold"},{"selector": "@a[tag=total_rank2]","color":"gold"},{"text":"（","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
+execute if entity @a[tag=total_rank3] run tellraw @a ["  ",{"text": "第三名 >  ","color":"yellow"},{"selector": "@a[tag=total_rank3]","color":"yellow"},{"text":"（","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":" 积分）","color":"gray"}]
 tellraw @a ""
 
 # 积分金粒奖励

data/mini/functions/ass/game_init.mcfunction

@@ -3,6 +3,7 @@ forceload add 1000 7000 1032 7032
 
 scoreboard players set $finish_mode mem 0
 scoreboard players set $countdown_fast mem 0
+scoreboard players set $show_score mem 0
 scoreboard players set $survival mem 0
 
 # 生成地图

data/mini/functions/colormatch/game_init.mcfunction

@@ -6,6 +6,7 @@ setblock 1049 11 3999 redstone_block
 # 初始化
 scoreboard players set $finish_mode mem 0
 scoreboard players set $survival mem 0
+scoreboard players set $show_score mem 0
 scoreboard players set $color_match_time mem 60
 scoreboard players set $color_match_type mem 0
 scoreboard players set $new_item_cd mem 0

data/mini/functions/hotpm/game_init.mcfunction

@@ -3,6 +3,7 @@ forceload add 1000 3000 1100 3100
 
 # 初始化
 scoreboard players set $finish_mode mem 0
+scoreboard players set $show_score mem 0
 scoreboard players set $survival mem 0
 scoreboard players set $new_item_cd mem 0
 scoreboard players reset * surviveRound

data/mini/functions/iron/game_init.mcfunction

@@ -4,6 +4,7 @@ forceload add 1000 5000 1064 5064
 scoreboard players reset * iron_count
 scoreboard players reset * iron_disp
 scoreboard players set $finish_mode mem 0
+scoreboard players set $show_score mem 1
 scoreboard players set $survival mem 1
 
 # 调整时间

data/mini/functions/main/show_result.mcfunction

@@ -1,5 +1,16 @@
-# 显示小游戏排名并给分
+# 显示小游戏排名
+tellraw @s ["",{"text":"\n------  小游戏结束！ ------\n","color":"light_purple","bold":true}]
 
-execute if entity @a[tag=mini_rank2] if entity @a[tag=mini_rank3] run tellraw @s [{"text":"\n >> 小游戏结束 >>\n\n","color":"gold","bold":true},{"text": " 第一名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank1]","color":"white","bold": false},{"text": "\n 第二名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank2]","color":"white","bold": false},{"text": "\n 第三名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank3]","color":"white","bold": false},"\n"]
-execute if entity @a[tag=mini_rank2] unless entity @a[tag=mini_rank3] run tellraw @s [{"text":"\n >> 小游戏结束 >>\n\n","color":"gold","bold":true},{"text": " 第一名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank1]","color":"white","bold": false},{"text": "\n 第二名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank2]","color":"white","bold": false},"\n"]
-execute unless entity @a[tag=mini_rank2] run tellraw @s [{"text":"\n >> 小游戏结束 >>\n\n","color":"gold","bold":true},{"text": " 第一名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank1]","color":"white","bold": false},"\n"]
+# 1
+execute if score $show_score mem matches 1 run tellraw @s ["  ",{"text": "第一名 >  ","color":"red"},{"selector": "@a[tag=mini_rank1]","color":"red"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=mini_rank1]","objective": "mini_score"},"color":"gray"},{"text":")","color":"gray"}]
+execute if score $show_score mem matches 0 run tellraw @s ["  ",{"text": "第一名 >  ","color":"red"},{"selector": "@a[tag=mini_rank1]","color":"red"}]
+
+# 2
+execute if score $show_score mem matches 1 if entity @a[tag=mini_rank2] run tellraw @s ["  ",{"text": "第二名 >  ","color":"gold"},{"selector": "@a[tag=mini_rank2]","color":"gold"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=mini_rank2]","objective": "mini_score"},"color":"gray"},{"text":")","color":"gray"}]
+execute if score $show_score mem matches 0 if entity @a[tag=mini_rank2] run tellraw @s ["  ",{"text": "第二名 >  ","color":"gold"},{"selector": "@a[tag=mini_rank2]","color":"gold"}]
+
+# 3
+execute if score $show_score mem matches 1 if entity @a[tag=mini_rank3] run tellraw @s ["  ",{"text": "第三名 >  ","color":"yellow"},{"selector": "@a[tag=mini_rank3]","color":"yellow"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=mini_rank3]","objective": "mini_score"},"color":"gray"},{"text":")","color":"gray"}]
+execute if score $show_score mem matches 0 if entity @a[tag=mini_rank3] run tellraw @s ["  ",{"text": "第三名 >  ","color":"yellow"},{"selector": "@a[tag=mini_rank3]","color":"yellow"}]
+
+tellraw @s ""

data/mini/functions/parkour/game_init.mcfunction

@@ -4,6 +4,7 @@ forceload add 1000 1000 1064 1064
 scoreboard players reset * treasure
 scoreboard players set $finish_mode mem 1
 scoreboard players set $tempo_enable mem 1
+scoreboard players set $show_score mem 0
 scoreboard players set $countdown_fast mem 0
 scoreboard players set $survival mem 0
 

data/mini/functions/phantom/game_init.mcfunction

@@ -2,6 +2,7 @@
 forceload add 1000 6000 1064 6064
 
 scoreboard players set $finish_mode mem 0
+scoreboard players set $show_score mem 1
 scoreboard players set $survival mem 0
 scoreboard players reset * kill_phantom
 scoreboard players reset * kill_phantom2

data/mini/functions/tntrun/game_init.mcfunction

@@ -4,6 +4,7 @@ forceload add 1000 2000 1050 2050
 scoreboard players reset * layer
 
 scoreboard players set $finish_mode mem 0
+scoreboard players set $show_score mem 0
 scoreboard players set $survival mem 0
 
 # 生成地图

data/mini/functions/trade/game_init.mcfunction

@@ -4,6 +4,7 @@ forceload add 1000 5000 1064 5064
 scoreboard players reset * emerald
 scoreboard players reset * interactVillager
 scoreboard players set $finish_mode mem 0
+scoreboard players set $show_score mem 1
 scoreboard players set $survival mem 1
 
 # 调整时间