旁观者视野调整、钓鱼竿再次削弱

data/item/functions/shop/buy/011_bow.mcfunction

@@ -1,12 +1,12 @@
-# 单发弓 (1g)
+# 一次性弓 (1g)
 scoreboard players add @s shop_01_bow 0
 tag @s remove canbuy
 tag @s[scores={shop_01_bow=0,gold=9..}] add canbuy
 tellraw @s[scores={shop_01_bow=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
 tellraw @s[scores={shop_01_bow=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_01_bow=..-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"}]
+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_01_bow 1
 scoreboard players remove @s[tag=canbuy] gold 9
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error

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

@@ -1,14 +1,14 @@
-# 破损的钓鱼竿 (2g)
+# 一次性钓鱼竿 (4g)
 scoreboard players add @s shop_07_fish 0
 tag @s remove canbuy
-tag @s[scores={shop_07_fish=0,gold=18..}] add canbuy
+tag @s[scores={shop_07_fish=0,gold=36..}] 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=..17}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_07_fish=0,gold=..35}] ["",{"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"}]
+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 18
+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
 execute as @s[tag=canbuy] run function item:shop/refresh_gold

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

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

@@ -1,15 +0,0 @@
-# 饵钓钓鱼竿 (2g)
-scoreboard players add @s shop_07_fish 0
-tag @s remove canbuy
-tag @s[scores={shop_07_fish=2,gold=18..}] add canbuy
-tellraw @s[scores={shop_07_fish=3..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_07_fish=2,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 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
-tag @s remove canbuy

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

@@ -1,15 +0,0 @@
-# 钓鱼竿耐久度升级 II (8g)
-scoreboard players add @s shop_07_fish 0
-tag @s remove 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=..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 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
-tag @s remove canbuy

data/item/functions/shop/document.txt

@@ -17,12 +17,10 @@
 + 钻石靴子
 + 下界合金靴子
 
-破损的钓鱼竿（5）
-+ 5% 耐久度（8）
-+ 饵钓 II
-+ 5% 耐久度（11）
+破损的钓鱼竿（1）
++ 5 耐久度（6）
 
-单发弓（1）
+一次性弓（1）
 + 1 耐久度（2）
 + 冲击 I
 

data/item/functions/shop/refresh_equip.mcfunction

@@ -2,7 +2,7 @@
 
 # 01
 clear @s bow
-give @s[scores={shop_01_bow=1}] bow{display:{Name:'{"text":"单发弓","italic":false,"color":"gray"}'},Damage:384}
+give @s[scores={shop_01_bow=1}] bow{display:{Name:'{"text":"一次性弓","italic":false,"color":"gray"}'},Damage:384}
 give @s[scores={shop_01_bow=2}] bow{display:{Name:'{"text":"弓","italic":false,"color":"gray"}'},Damage:346}
 give @s[scores={shop_01_bow=3}] bow{display:{Name:'{"text":"<冲击 I> 弓","italic":false,"color":"white"}'},Damage:346,Enchantments:[{id:"minecraft:punch",lvl:1s}]}
 
@@ -41,7 +41,5 @@ 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: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:54,Enchantments:[{id:"minecraft:lure",lvl:2s}]}
+give @s[scores={shop_07_fish=1}] fishing_rod{display:{Name:'{"text":"一次性钓鱼竿","italic":false,"color":"gray"}'},Damage:64}
+give @s[scores={shop_07_fish=2..}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"white"}'},Damage:60}

data/mini/functions/ass/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=7001,dx=30,dy=30,dz=30] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=7001,dx=30,dy=30,dz=30] run tp @s[team=!debugging] 1016 18 7016
+execute as @a[gamemode=spectator] unless entity @s[x=1004.5,y=7,z=7005.5,dx=23,dy=15,dz=23] run spectate
+execute as @a[gamemode=spectator] unless entity @s[x=1004.5,y=7,z=7005.5,dx=23,dy=15,dz=23] run tp @s[team=!debugging] 1012.33 12.13 7006.82 -28.40 23.85

data/mini/functions/colormatch/player_intro.mcfunction

@@ -1,4 +1,4 @@
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1062.78 22.00 4019.40 178.41 40.03
+tp @s[team=!debugging] 1062.43 22.00 4012.88 136.56 30.58
 tellraw @s ["",{"text":"\n >> 色彩迷阵 >>\n\n","color":"gold","bold":true}," 站在 ",{"text":"与墙壁相同的方块","color":"gold"}," 上！\n 倒计时结束时, 与墙壁不相同的地板都会消失！\n\n",{"text": " <只能击退玩家> ","color":"yellow"},"\n"]
 effect give @s night_vision 1000000 0 true

data/mini/functions/colormatch/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限定范围
-execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1049,y=10,z=3999,dx=22,dy=31,dz=22] run tp @s[team=!debugging] 1062 22 4012
+execute as @a[gamemode=spectator] at @s anchored eyes unless block ~ ~ ~ air run spectate
+execute as @a[gamemode=spectator] at @s anchored eyes unless block ~ ~ ~ air run tp @s[team=!debugging] 1062.43 22.00 4012.88 136.56 30.58

data/mini/functions/hotpm/player_intro.mcfunction

@@ -1,4 +1,4 @@
 # 向单个玩家展示小游戏介绍
-tp @s[team=!debugging] 1029 15 3007.77 -290.29 32.65
+tp @s[team=!debugging] 1026.52 12.76 3005.59 47.21 22.60
 tellraw @s ["",{"text":"\n >> 炸弹狂魔 >>\n\n","color":"gold","bold":true}," 炸弹会在一段时间后爆炸！\n 在持有炸弹时, 只要 ",{"text":"攻击其他人","color":"gold"}," 就能把炸弹甩给他！\n 努力存活下来吧！\n\n",{"text": " <只能击退玩家> ","color":"yellow"},"\n"]
 effect give @s night_vision 1000000 0 true

data/mini/functions/hotpm/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator,team=!debugging] run spectate
-execute as @a[gamemode=spectator,team=!debugging] unless entity @s[x=1001,y=5,z=3001,dx=29,dy=11,dz=27] run tp @s 1029 15 3007.77 -290.29 32.65
+execute as @a[gamemode=spectator,team=!debugging] unless entity @s[x=1001.5,y=6,z=3001.5,dx=29,dy=11,dz=27] run spectate
+execute as @a[gamemode=spectator,team=!debugging] unless entity @s[x=1001.5,y=6,z=3001.5,dx=29,dy=11,dz=27] run tp @s 1026.52 12.76 3005.59 47.21 22.60

data/mini/functions/iron/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
-tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 5016
+tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1010.90 259.12 5024.86 -147.81 49.05

data/mini/functions/parkour/watcher_limit.mcfunction

@@ -1,3 +1,2 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=7,z=1001,dx=30,dy=30,dz=62] run tp @s[team=!debugging] 1027.56 18.03 1046.89 13.48 4.84
+execute as @a[gamemode=spectator] at @s unless entity @a[team=playing,distance=..0.1] run spectate @r[team=playing]

data/mini/functions/phantom/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator] if entity @s[x=1000,y=30,z=6000,distance=100..] run spectate
-execute as @a[gamemode=spectator] if entity @s[x=1000,y=30,z=6000,distance=100..] run tp @s[team=!debugging] 1062.34 27.11 6040.84 461.44 28.30
+execute as @a[gamemode=spectator] if entity @s[x=1000,y=30,z=6000,distance=100..] run tp @s[team=!debugging] 1036.26 27.11 6041.22 142.84 34.90

data/mini/functions/tntrun/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=10,z=2001,dx=37,dy=37,dz=37] run spectate
-execute as @a[gamemode=spectator] unless entity @s[x=1001,y=10,z=2001,dx=37,dy=37,dz=37] run tp @s[team=!debugging] 1023.65 20.29 2006.59 -345.99 17.34
+execute as @a[gamemode=spectator] unless entity @s[x=1005.5,y=15,z=2007.5,dx=26,dy=30,dz=25] run spectate
+execute as @a[gamemode=spectator] unless entity @s[x=1005.5,y=15,z=2007.5,dx=26,dy=30,dz=25] run tp @s[team=!debugging] 1021.30 36.04 2012.92 18.81 38.79

data/mini/functions/trade/watcher_limit.mcfunction

@@ -1,3 +1,3 @@
 # 观察者限制飞行范围
 execute as @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..] run spectate
-tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1016 255 5016
+tp @a[gamemode=spectator,x=1016,y=240,z=5016,distance=70..,team=!debugging] 1010.90 259.12 5024.86 -147.81 49.05