完成新跑酷

data/item/functions/shop/buy/051_axe.mcfunction

@@ -1,14 +1,14 @@
-# 破损的木斧 (2g)
+# 破损的木斧 (1g)
 scoreboard players add @s shop_05_axe 0
 tag @s remove canbuy
 tag @s[scores={shop_05_axe=0,gold=9..}] add canbuy
 tellraw @s[scores={shop_05_axe=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_05_axe=0,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_05_axe=0,gold=..10}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_05_axe=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
 tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"破损的木斧","color":"green"}]
 execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"破损的木斧","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_05_axe 1
-scoreboard players remove @s[tag=canbuy] gold 18
+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
 execute as @s[tag=canbuy] run function item:shop/refresh_gold

data/item/functions/shop/buy/071_fish.mcfunction

@@ -1,14 +1,14 @@
-# 破损的钓鱼竿 (1g)
+# 破损的钓鱼竿 (2g)
 scoreboard players add @s shop_07_fish 0
 tag @s remove canbuy
-tag @s[scores={shop_07_fish=0,gold=9..}] add canbuy
+tag @s[scores={shop_07_fish=0,gold=18..}] add canbuy
 tellraw @s[scores={shop_07_fish=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_07_fish=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_07_fish=0,gold=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_07_fish=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
 tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"破损的钓鱼竿","color":"green"}]
 execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"破损的钓鱼竿","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_07_fish 1
-scoreboard players remove @s[tag=canbuy] gold 9
+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
 execute as @s[tag=canbuy] run function item:shop/refresh_gold

data/item/functions/shop/buy/074_fish.mcfunction

@@ -1,14 +1,14 @@
-# 钓鱼竿耐久度升级 II (4g)
+# 钓鱼竿耐久度升级 II (8g)
 scoreboard players add @s shop_07_fish 0
 tag @s remove canbuy
-tag @s[scores={shop_07_fish=3,gold=36..}] add canbuy
+tag @s[scores={shop_07_fish=3,gold=72..}] add canbuy
 tellraw @s[scores={shop_07_fish=4..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_07_fish=3,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_07_fish=3,gold=..71}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_07_fish=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
 tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"钓鱼竿耐久度升级 II","color":"green"}]
 execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"钓鱼竿耐久度升级 II","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_07_fish 1
-scoreboard players remove @s[tag=canbuy] gold 36
+scoreboard players remove @s[tag=canbuy] gold 72
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 execute as @s[tag=canbuy] run function item:shop/refresh_gold

data/item/functions/shop/buy/999_dice.mcfunction

@@ -1,7 +1,7 @@
 # 骰子 (1g)
 tag @s remove canbuy
 tag @s[scores={gold=9..}] add canbuy
-tellraw @s[scores={gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金粒来赌骰子!","color":"red"}]
+tellraw @s[scores={gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来赌骰子!","color":"red"}]
 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] run function ltw:state/0/roll_dice/roll

data/item/functions/shop/check.mcfunction

@@ -1,7 +1,7 @@
 # 范围检测
-execute if score @s buy_trigger matches 011..074 at @s unless entity @s[x=-3,z=-63,y=6,dx=25,dy=6,dz=30] run function item:shop/error/piglin
-execute if score @s buy_trigger matches 101..103 at @s unless entity @s[x=1,z=-63,y=20,dx=5,dy=4,dz=6] run function item:shop/error/piglin
-execute if score @s buy_trigger matches 201..219 at @s unless entity @s[x=-22,z=-75,y=18,dx=10,dy=4,dz=5] run function item:shop/error/villager
+execute if score @s buy_trigger matches 001..099 at @s unless entity @s[x=-3,z=-63,y=6,dx=25,dy=6,dz=30] run function item:shop/error/piglin
+execute if score @s buy_trigger matches 100..199 at @s unless entity @s[x=1,z=-63,y=20,dx=5,dy=4,dz=6] run function item:shop/error/piglin
+execute if score @s buy_trigger matches 200..299 at @s unless entity @s[x=-22,z=-75,y=18,dx=10,dy=4,dz=5] run function item:shop/error/villager
 execute if score @s buy_trigger matches 999 at @s unless entity @s[x=-3,z=-49,y=27,dx=5,dy=4,dz=5] run function item:shop/error/dice
 
 # 普通商店

data/item/functions/shop/document.txt

@@ -17,10 +17,10 @@
 + 钻石靴子
 + 下界合金靴子
 
-破损的钓鱼竿（3）
-+ 10% 耐久度（9）
+破损的钓鱼竿（5）
++ 5% 耐久度（8）
 + 饵钓 II
-+ 10% 耐久度（15）
++ 10% 耐久度（14）
 
 单发弓（1）
 + 1 耐久度（2）

data/item/functions/shop/refresh_equip.mcfunction

@@ -41,7 +41,7 @@ item replace entity @s[scores={shop_06_armor=4}] armor.feet with netherite_boots
 
 # 07
 clear @s fishing_rod
-give @s[scores={shop_07_fish=1}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:62}
-give @s[scores={shop_07_fish=2}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:56}
-give @s[scores={shop_07_fish=3}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:56,Enchantments:[{id:"minecraft:lure",lvl:2s}]}
-give @s[scores={shop_07_fish=4}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:50,Enchantments:[{id:"minecraft:lure",lvl:2s}]}
+give @s[scores={shop_07_fish=1}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:60}
+give @s[scores={shop_07_fish=2}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:57}
+give @s[scores={shop_07_fish=3}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:57,Enchantments:[{id:"minecraft:lure",lvl:2s}]}
+give @s[scores={shop_07_fish=4}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:51,Enchantments:[{id:"minecraft:lure",lvl:2s}]}

data/ltw/advancements/parkour/treasure1.json

@@ -2,13 +2,13 @@
     "parent": "ltw:parkour/root",
     "display": {
       "icon": {
-        "item": "minecraft:oak_leaves"
+        "item": "minecraft:iron_boots"
       },
       "title": {
-        "text": "宝藏学徒      "
+        "text": "争分夺秒 · α      "
       },
       "description": [
-        {"text": "在遗迹寻宝中收集 4 处宝藏\n", "color":"gray"},
+        {"text": "在遗迹寻宝中，于 100 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/treasure2.json

@@ -2,13 +2,13 @@
     "parent": "ltw:parkour/treasure1",
     "display": {
       "icon": {
-        "item": "minecraft:chest"
+        "item": "minecraft:diamond_boots"
       },
       "title": {
-        "text": "宝藏大师      "
+        "text": "争分夺秒 · β    "
       },
       "description": [
-        {"text": "在遗迹寻宝中收集 7 处宝藏\n", "color":"gray"},
+        {"text": "在遗迹寻宝中，于 60 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/parkour/treasure3.json

@@ -2,13 +2,13 @@
     "parent": "ltw:parkour/treasure2",
     "display": {
       "icon": {
-        "item": "minecraft:ender_chest"
+        "item": "minecraft:netherite_boots"
       },
       "title": {
-        "text": "不做选择题    "
+        "text": "争分夺秒 · γ    "
       },
       "description": [
-        {"text": "在遗迹寻宝中收集全部宝藏\n", "color":"gray"},
+        {"text": "在遗迹寻宝中，于 40 秒内到达终点\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "3 绿宝石","color":"white"}
       ],

data/mini/functions/ass/game_init.mcfunction

@@ -1,7 +1,6 @@
 # 初始化刺客地图
 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

@@ -4,7 +4,6 @@ setblock 1049 10 3999 minecraft:structure_block[mode=load]{metadata:"",mirror:"N
 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

data/mini/functions/hotpm/game_init.mcfunction

@@ -2,7 +2,6 @@
 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

data/mini/functions/iron/game_init.mcfunction

@@ -3,7 +3,6 @@ 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/check_game_end.mcfunction

@@ -1,6 +1,4 @@
 # 检查游戏是否可以结束
 
 function mini:main/update_player_count
-
-execute if score $state mem matches 5 if score $finish_mode mem matches 1 if score $player_finish mem matches 3.. run function mini:main/game_end
-execute if score $state mem matches 5 if score $player_alive mem matches ..1 run function mini:main/game_end
+execute if score $state mem matches 5 if score $player_alive mem matches ..1 unless score $mini_type mem matches 1 run function mini:main/game_end

data/mini/functions/main/init.mcfunction

@@ -1,6 +1,5 @@
 # 初始化
 function mini:tntrun/init
-function mini:parkour/init
 function mini:hotpm/init
 function mini:phantom/init
 function mini:iron/init

data/mini/functions/main/player_finished.mcfunction

@@ -1,18 +0,0 @@
-# 玩家成功时由玩家自己触发
-
-# 计数
-tag @s remove mini_running
-function mini:main/update_player_count
-
-# 显示提示
-execute if entity @s[tag=!rejoining] if score $player_finish mem matches ..3 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s","color":"green"}," 已完成! 获得了第 ",{"score": {"name": "$player_finish","objective": "mem"}}," 名!"]
-execute as @a at @s run function lib:sounds/error
-
-# 给已完成的玩家加分
-scoreboard players add @a[tag=!mini_running] mini_score 1
-
-# 进入旁观
-gamemode spectator
-
-# 检查游戏是否结束
-function mini:main/check_game_end

data/mini/functions/parkour/game/generate_1.mcfunction

@@ -4,7 +4,7 @@ tag @e[tag=treasure] add cangen
 # 旁边 3 格没有其他奖励物品
 execute as @e[tag=bonus_item] at @s run tag @e[tag=treasure,distance=..3] remove cangen
 # 旁边 8 格没有玩家
-execute as @a[tag=mini_running] at @s run tag @e[tag=treasure,distance=..8] remove cangen
+execute as @a[team=playing] at @s run tag @e[tag=treasure,distance=..8] remove cangen
 
 # 生成奖励物品
 execute as @e[tag=cangen,sort=random,limit=1] at @s run function item:bonus_item/gameparty/auto/low3

data/mini/functions/parkour/game/on_finish.mcfunction

@@ -0,0 +1,5 @@
+# 回城营火
+tag @s remove parkour_portal
+function lib:sounds/teleport
+tp ~5 ~-4 ~-12
+execute if entity @s[tag=mini_running] run function mini:parkour/player_finished

data/mini/functions/parkour/game_end.mcfunction

@@ -3,6 +3,3 @@ forceload remove 1000 1000 1064 1064
 
 # 关闭节奏块
 scoreboard players set $tempo_enable mem 0
-
-# 计算积分
-execute as @a[team=playing] run scoreboard players operation @s mini_score += @s treasure

data/mini/functions/parkour/game_init.mcfunction

@@ -1,8 +1,6 @@
 # 初始化跑酷地图
 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

data/mini/functions/parkour/game_start.mcfunction

@@ -1,12 +1,12 @@
 # 游戏结束倒计时
-scoreboard players set $countdown mem 130
+scoreboard players set $countdown mem 150
 
 # HUD
 scoreboard objectives setdisplay list total_score_disp
 scoreboard objectives setdisplay belowName total_score_disp
-scoreboard objectives setdisplay sidebar treasure
+scoreboard objectives setdisplay sidebar total_score
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 130
+scoreboard players set $countdown_max mem 150
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:blue name "剩余时间"

data/mini/functions/parkour/init.mcfunction

@@ -1,3 +0,0 @@
-# 重置计分板
-scoreboard objectives remove treasure
-scoreboard objectives add treasure dummy "获得宝藏数"

data/mini/functions/parkour/player_enter.mcfunction

@@ -10,20 +10,6 @@ function mini:parkour/give_effect
 attribute @s generic.max_health base set 20
 gamerule naturalRegeneration true
 
-# 计分板重置
-scoreboard players reset @s treasure
-scoreboard players set @s[team=playing,tag=!rejoining] treasure 0
-tag @s remove treasure1
-tag @s remove treasure2
-tag @s remove treasure3
-tag @s remove treasure4
-tag @s remove treasure5
-tag @s remove treasure6
-tag @s remove treasure7
-tag @s remove treasure8
-tag @s remove treasure9
-tag @s remove treasure10
-
 # 传送玩家
 spreadplayers 1018 1007 4 6 under 9 false @s[team=playing,tag=!rejoining]
 # tp @s[team=playing,tag=!rejoining] 1010.07 7.50 1006.98 -1518.69 -10.62

data/mini/functions/parkour/player_finished.mcfunction

@@ -1,2 +1,22 @@
 # 玩家成功时由玩家自己触发
-function mini:main/player_finished
+
+# 计数
+tag @s remove mini_running
+function mini:main/update_player_count
+
+# 计算时间
+scoreboard players set #temp mem 150
+scoreboard players operation #temp mem -= $countdown mem
+execute if score #temp mem matches 1..100 run advancement grant @s only ltw:parkour/treasure1
+execute if score #temp mem matches 1..60 run advancement grant @s only ltw:parkour/treasure2
+execute if score #temp mem matches 1..40 run advancement grant @s only ltw:parkour/treasure3
+
+# 显示提示
+execute if entity @s[tag=!rejoining] if score $player_finish mem matches 1 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s"},{"text": " 已到达终点，用时 ","color":"green"},{"score": {"name": "#temp","objective": "mem"}}," 秒",{"text": "！第 ","color":"green"},{"score": {"name": "$player_finish","objective": "mem"},"color":"green"},{"text": " 名！","color":"green"}]
+execute if entity @s[tag=!rejoining] if score $player_finish mem matches 2..3 run tellraw @a ["",{"text": ">> ","color":"green","bold": true},{"selector": "@s"},{"text": " 已到达终点！第 ","color":"green"},{"score": {"name": "$player_finish","objective": "mem"},"color":"green"},{"text": " 名！","color":"green"}]
+execute if entity @s[tag=!rejoining] if score $player_finish mem matches 3 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "前三名已全部决出！无需再前往终点了，专心收集宝藏吧！","color":"aqua"}]
+execute if entity @s[tag=!rejoining] if score $player_finish mem matches ..2 run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text": "继续收集宝藏，直到时间结束吧！","color":"aqua"}]
+execute as @a at @s run function lib:sounds/levelup
+
+# 给已完成的玩家加分
+scoreboard players add @a[tag=!mini_running] mini_score 1

data/mini/functions/parkour/tick5.mcfunction

@@ -1,7 +1,5 @@
 # 回城营火
-execute as @a[tag=mini_running,x=1005,y=11,z=1018,dx=2,dy=3,dz=2] at @s run tag @s remove parkour_portal
-execute as @a[tag=mini_running,x=1005,y=11,z=1018,dx=2,dy=3,dz=2] at @s run function lib:sounds/teleport
-execute as @a[tag=mini_running,x=1005,y=11,z=1018,dx=2,dy=3,dz=2] at @s run tp ~5 ~-4 ~-12
+execute as @a[team=playing,x=1005,y=11,z=1018,dx=2,dy=3,dz=2] at @s run function mini:parkour/game/on_finish
 
 # 掉落方块保持
 execute as @e[type=falling_block,tag=parkour_block] run data modify entity @s Time set value 1

data/mini/functions/phantom/game_init.mcfunction

@@ -1,7 +1,6 @@
 # 初始化幻翼地图
 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

data/mini/functions/tntrun/game_init.mcfunction

@@ -3,7 +3,6 @@ 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

@@ -3,7 +3,6 @@ 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