*

data/ltw/functions/init.mcfunction

@@ -64,6 +64,7 @@ scoreboard players set #const_2 mem 2
 scoreboard players set #const_5 mem 5
 scoreboard players set #const_9 mem 9
 scoreboard players set #const_10 mem 10
+scoreboard players set #const_81 mem 81
 scoreboard players set #const_100 mem 100
 scoreboard players set $game_type mem 1
 

data/ltw/functions/main/game_end.mcfunction

@@ -40,9 +40,11 @@ scoreboard players operation #rank3_gold mem *= #total_gold mem
 scoreboard players operation #rank3_gold mem /= #const_100 mem
 
 # 显示排名
-execute if entity @a[tag=total_rank2] if entity @a[tag=total_rank3] run tellraw @a ["",{"text":"\n\n----- 游戏结束 -----\n\n","color":"green","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":" 分)","color":"gray"},{"text": "\n第二名 - ","color":"green"},{"selector": "@a[tag=total_rank2]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":" 分)","color":"gray"},{"text": "\n第三名 - ","color":"green"},{"selector": "@a[tag=total_rank3]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":" 分)","color":"gray"},"\n\n"]
-execute if entity @a[tag=total_rank2] unless entity @a[tag=total_rank3] run tellraw @a ["",{"text":"\n\n\n----- 游戏结束 -----\n\n","color":"green","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":" 分)","color":"gray"},{"text": "\n第二名 - ","color":"green"},{"selector": "@a[tag=total_rank2]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":" 分)","color":"gray"},"\n\n\n"]
-execute unless entity @a[tag=total_rank2] run tellraw @a ["",{"text":"\n\n\n\n----- 游戏结束 -----\n\n","color":"green","bold":true},{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":" 分)","color":"gray"},"\n\n\n"]
+tellraw @a ["",{"text":"\n\n\n\n----- 游戏结束 -----\n\n","color":"green","bold":true}]
+tellraw @a ["",{"text": "第一名 - ","color":"green"},{"selector": "@a[tag=total_rank1]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank1]","objective": "total_score"},"color":"gray"},{"text":" 分, +","color":"gray"},{"score":{"name": "#rank1_gold","objective": "mem"},"color":"gray"},{"text":"g)\n","color":"gray"}]
+execute if entity @a[tag=total_rank2] run tellraw @a ["",{"text": "第二名 - ","color":"green"},{"selector": "@a[tag=total_rank2]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank2]","objective": "total_score"},"color":"gray"},{"text":" 分, +","color":"gray"},{"score":{"name": "#rank2_gold","objective": "mem"},"color":"gray"},{"text":"g)\n","color":"gray"}]
+execute if entity @a[tag=total_rank3] run tellraw @a ["",{"text": "第三名 - ","color":"green"},{"selector": "@a[tag=total_rank3]","color":"white"},{"text":" (","color":"gray"},{"score":{"name": "@p[tag=total_rank3]","objective": "total_score"},"color":"gray"},{"text":" 分, +","color":"gray"},{"score":{"name": "#rank3_gold","objective": "mem"},"color":"gray"},{"text":"g)\n","color":"gray"}]
+tellraw @a ["\n\n"]
 
 # 给予金粒奖励
 execute as @a[tag=total_rank1] run scoreboard players operation @s gold += #rank1_gold mem

data/ltw/functions/shop/buy_apple1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 270
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_armor1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 36
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_armor2.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 63
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_armor3.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 90
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_arrow1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 9
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_arrow2.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 45
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_potion1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 36
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_weapon1.mcfunction

@@ -15,4 +15,4 @@ scoreboard players remove @s[tag=canbuy] gold 18
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/buy_weapon2.mcfunction

@@ -16,4 +16,4 @@ scoreboard players remove @s[tag=canbuy] gold 54
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 
-function ltw:shop/refresh_gold
+execute as @s[tag=canbuy] run function ltw:shop/refresh_gold

data/ltw/functions/shop/refresh_gold.mcfunction

@@ -1,10 +1,17 @@
 # 刷新单个玩家背包中的金粒
 
+clear @s gold_block
 clear @s gold_ingot
 clear @s gold_nugget
 
+# 获取金块数，存于 temp
+scoreboard players operation @s temp = @s gold
+scoreboard players operation @s temp /= #const_81 mem
+# 给予金锭
+execute if score @s temp matches 1.. at @s run function ltw:shop/summon_block
 # 获取金锭数，存于 temp
 scoreboard players operation @s temp = @s gold
+scoreboard players operation @s temp %= #const_81 mem
 scoreboard players operation @s temp /= #const_9 mem
 # 给予金锭
 execute if score @s temp matches 1.. at @s run function ltw:shop/summon_gold