新的粒子系统

data/item/functions/particle/show_particle.mcfunction

@@ -1,17 +1,17 @@
+# 检查状态
+tag @a remove invisible
+tag @a[nbt={ActiveEffects:[{Id:14b}]}] add invisible
+
 # 播放玩家粒子效果
-execute as @a[scores={particle_type=1},gamemode=!spectator] at @s run particle composter ~ ~0.1 ~ 0.15 0 0.15 0.001 2 force @a
-execute as @a[scores={particle_type=2},gamemode=!spectator] at @s run particle dust 1 1 1 1.5 ~ ~0.1 ~ 0.15 0 0.15 0.001 2 force @a
-execute as @a[scores={particle_type=3},gamemode=!spectator] at @s run particle falling_water ~ ~0.1 ~ 0.15 0 0.15 0.001 3 force @a
-execute as @a[scores={particle_type=4},gamemode=!spectator] at @s run particle flame ~ ~0.1 ~ 0.15 0 0.15 0.001 2 force @a
-execute as @a[scores={particle_type=5},gamemode=!spectator] at @s run particle dust 10 10 10 1.5 ~ ~0.1 ~ 0.15 0 0.15 0.001 2 force @a
-execute as @a[scores={particle_type=6},gamemode=!spectator] at @s run particle soul_fire_flame ~ ~0.1 ~ 0.15 0 0.15 0.001 1 force @a
-execute as @a[scores={particle_type=6},gamemode=!spectator] at @s run particle flame ~ ~0.1 ~ 0.15 0 0.15 0.001 1 force @a
+execute as @a[scores={particle_type=1},gamemode=!spectator,tag=!invisible] at @s run particle electric_spark ~ ~0.5 ~ 0.25 0.3 0.25 0 1 force @a
+execute as @a[scores={particle_type=2},gamemode=!spectator,tag=!invisible] at @s run particle composter ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a
+execute as @a[scores={particle_type=3},gamemode=!spectator,tag=!invisible] at @s run particle glow ~ ~0.2 ~ 0.2 0.1 0.2 0 1 force @a
+execute as @a[scores={particle_type=4},gamemode=!spectator,tag=!invisible] at @s run particle witch ~ ~0.2 ~ 0.25 0.1 0.25 0 1 force @a
+execute as @a[scores={particle_type=5},gamemode=!spectator,tag=!invisible] at @s run particle wax_on ~ ~0.5 ~ 0.25 0.3 0.25 2 1 force @a
 
 # 播放展示用实体的粒子效果
-execute as @e[type=!player,tag=show_particle_1] at @s run particle composter ~ ~0.5 ~ 0.15 0.15 0.15 0.001 2 force @a
-execute as @e[type=!player,tag=show_particle_2] at @s run particle dust 1 1 1 1.5 ~ ~0.5 ~ 0.1 0.15 0.1 0.001 1 force @a
-execute as @e[type=!player,tag=show_particle_3] at @s run particle falling_water ~ ~0.8 ~ 0.2 0.15 0.2 0.001 3 force @a
-execute as @e[type=!player,tag=show_particle_4] at @s run particle flame ~ ~0.5 ~ 0.15 0.15 0.15 0.001 1 force @a
-execute as @e[type=!player,tag=show_particle_5] at @s run particle dust 10 10 10 1.5 ~ ~0.5 ~ 0.1 0.15 0.1 0.001 1 force @a
-execute as @e[type=!player,tag=show_particle_6] at @s run particle soul_fire_flame ~ ~0.5 ~ 0.1 0.15 0.1 0.001 1 force @a
-execute as @e[type=!player,tag=show_particle_6] at @s run particle flame ~ ~0.5 ~ 0.1 0.15 0.1 0.001 1 force @a
+execute as @e[tag=show_particle_1] at @s run particle electric_spark ~ ~0.5 ~ 0.1 0.1 0.1 0 1 force @a
+execute as @e[tag=show_particle_2] at @s run particle composter ~ ~0.5 ~ 0.15 0.15 0.15 2 1 force @a
+execute as @e[tag=show_particle_3] at @s run particle glow ~ ~0.3 ~ 0.15 0.15 0.15 0 1 force @a
+execute as @e[tag=show_particle_4] at @s run particle witch ~ ~0.2 ~ 0.15 0.05 0.15 0 1 force @a
+execute as @e[tag=show_particle_5] at @s run particle wax_on ~ ~0.5 ~ 0.2 0.2 0.2 0.5 1 force @a

data/item/functions/shop/buy/201_particle_close.mcfunction

@@ -0,0 +1,6 @@
+# 特效 (10e)
+scoreboard players add @s shop_particle 0
+
+tellraw @s ["",{"text":">> ","color":"green","bold":true},{"text":"已将装饰关闭","color":"green"}]
+execute as @s at @s run function lib:sounds/hit
+scoreboard players set @s particle_type 0

data/item/functions/shop/buy/201_particle_system.mcfunction

@@ -1,16 +0,0 @@
-# 粒子系统 (2 eb)
-scoreboard players add @s shop_particle_system 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_system=0,green=18..}] add canbuy
-
-tellraw @s[scores={shop_particle_system=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了尾迹特效了!","color":"aqua"}]
-tellraw @s[scores={shop_particle_system=0,green=..17}] ["",{"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_particle_system 1
-scoreboard players remove @s[tag=canbuy] green 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_green
-tag @s remove canbuy

data/item/functions/shop/buy/210_particle_close.mcfunction

@@ -1,10 +0,0 @@
-# 关闭粒子 (0 e)
-scoreboard players add @s shop_particle_system 0
-
-tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_system=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已 ",{"text":"关闭","color":"green"}]
-execute as @s[scores={shop_particle_system=1..}] at @s run function lib:sounds/hit
-
-scoreboard players set @s particle_type 0

data/item/functions/shop/buy/211_particle.mcfunction

@@ -0,0 +1,20 @@
+# 特效 (10e)
+scoreboard players add @s shop_particle 0
+tag @s remove canbuy
+
+tellraw @s[scores={shop_particle=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的装饰!","color":"red"}]
+tellraw @s[scores={shop_particle=0,green=..9}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买这个装饰!","color":"red"}]
+tag @s[scores={shop_particle=0,green=10..}] add canbuy
+tellraw @s[scores={shop_particle=1..}] ["",{"text":">> ","color":"green","bold":true},"当前装饰已切换为 ",{"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_particle 1
+scoreboard players remove @s[tag=canbuy] green 10
+execute as @s[tag=!canbuy,scores={shop_particle=..0}] at @s run function lib:sounds/error
+execute as @s[tag=!canbuy,scores={shop_particle=1..}] at @s run function lib:sounds/hit
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle=1..}] particle_type 1

data/item/functions/shop/buy/211_particle1.mcfunction

@@ -1,10 +0,0 @@
-# 绿光粒子 (0 e)
-scoreboard players add @s shop_particle_system 0
-
-tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_system=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"绿光","color":"green"}]
-execute as @s[scores={shop_particle_system=1..}] at @s run function lib:sounds/hit
-
-scoreboard players set @s[scores={shop_particle_system=1..}] particle_type 1

data/item/functions/shop/buy/212_particle.mcfunction

@@ -0,0 +1,20 @@
+# 特效 (10e)
+scoreboard players add @s shop_particle 0
+tag @s remove canbuy
+
+tellraw @s[scores={shop_particle=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的装饰!","color":"red"}]
+tellraw @s[scores={shop_particle=1,green=..9}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买这个装饰!","color":"red"}]
+tag @s[scores={shop_particle=1,green=10..}] add canbuy
+tellraw @s[scores={shop_particle=2..}] ["",{"text":">> ","color":"green","bold":true},"当前装饰已切换为 ",{"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_particle 1
+scoreboard players remove @s[tag=canbuy] green 10
+execute as @s[tag=!canbuy,scores={shop_particle=..1}] at @s run function lib:sounds/error
+execute as @s[tag=!canbuy,scores={shop_particle=2..}] at @s run function lib:sounds/hit
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle=2..}] particle_type 2

data/item/functions/shop/buy/212_particle2.mcfunction

@@ -1,24 +0,0 @@
-# 素雅粒子 (3 e)
-scoreboard players add @s shop_particle_system 0
-scoreboard players add @s shop_particle_2 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_system=1..,shop_particle_2=0,green=3..}] add canbuy
-
-tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_2=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"素雅","color":"green"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_2=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_2=0,green=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_2=0,green=..2}] at @s run function lib:sounds/error
-
-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_particle_2 1
-scoreboard players remove @s[tag=canbuy] green 3
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_2=1..}] particle_type 2

data/item/functions/shop/buy/213_particle.mcfunction

@@ -0,0 +1,20 @@
+# 特效 (10e)
+scoreboard players add @s shop_particle 0
+tag @s remove canbuy
+
+tellraw @s[scores={shop_particle=..1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的装饰!","color":"red"}]
+tellraw @s[scores={shop_particle=2,green=..9}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买这个装饰!","color":"red"}]
+tag @s[scores={shop_particle=2,green=10..}] add canbuy
+tellraw @s[scores={shop_particle=3..}] ["",{"text":">> ","color":"green","bold":true},"当前装饰已切换为 ",{"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_particle 1
+scoreboard players remove @s[tag=canbuy] green 10
+execute as @s[tag=!canbuy,scores={shop_particle=..2}] at @s run function lib:sounds/error
+execute as @s[tag=!canbuy,scores={shop_particle=3..}] at @s run function lib:sounds/hit
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle=3..}] particle_type 3

data/item/functions/shop/buy/213_particle3.mcfunction

@@ -1,24 +0,0 @@
-# 水滴粒子 (3 e)
-scoreboard players add @s shop_particle_system 0
-scoreboard players add @s shop_particle_3 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_system=1..,shop_particle_3=0,green=3..}] add canbuy
-
-tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_3=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"水滴","color":"green"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_3=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_3=0,green=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_3=0,green=..2}] at @s run function lib:sounds/error
-
-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_particle_3 1
-scoreboard players remove @s[tag=canbuy] green 3
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_3=1..}] particle_type 3

data/item/functions/shop/buy/214_particle.mcfunction

@@ -0,0 +1,20 @@
+# 特效 (10e)
+scoreboard players add @s shop_particle 0
+tag @s remove canbuy
+
+tellraw @s[scores={shop_particle=..2}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的装饰!","color":"red"}]
+tellraw @s[scores={shop_particle=3,green=..9}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买这个装饰!","color":"red"}]
+tag @s[scores={shop_particle=3,green=10..}] add canbuy
+tellraw @s[scores={shop_particle=4..}] ["",{"text":">> ","color":"green","bold":true},"当前装饰已切换为 ",{"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_particle 1
+scoreboard players remove @s[tag=canbuy] green 10
+execute as @s[tag=!canbuy,scores={shop_particle=..3}] at @s run function lib:sounds/error
+execute as @s[tag=!canbuy,scores={shop_particle=4..}] at @s run function lib:sounds/hit
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle=4..}] particle_type 4

data/item/functions/shop/buy/214_particle4.mcfunction

@@ -1,24 +0,0 @@
-# 烈焰粒子 (6 e)
-scoreboard players add @s shop_particle_system 0
-scoreboard players add @s shop_particle_4 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_system=1..,shop_particle_4=0,green=6..}] add canbuy
-
-tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_4=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"烈焰","color":"green"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_4=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_4=0,green=..5}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_4=0,green=..5}] at @s run function lib:sounds/error
-
-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_particle_4 1
-scoreboard players remove @s[tag=canbuy] green 6
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_4=1..}] particle_type 4

data/item/functions/shop/buy/215_particle.mcfunction

@@ -0,0 +1,20 @@
+# 特效 (10e)
+scoreboard players add @s shop_particle 0
+tag @s remove canbuy
+
+tellraw @s[scores={shop_particle=..3}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的装饰!","color":"red"}]
+tellraw @s[scores={shop_particle=4,green=..9}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买这个装饰!","color":"red"}]
+tag @s[scores={shop_particle=4,green=10..}] add canbuy
+tellraw @s[scores={shop_particle=5..}] ["",{"text":">> ","color":"green","bold":true},"当前装饰已切换为 ",{"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_particle 1
+scoreboard players remove @s[tag=canbuy] green 10
+execute as @s[tag=!canbuy,scores={shop_particle=..4}] at @s run function lib:sounds/error
+execute as @s[tag=!canbuy,scores={shop_particle=5..}] at @s run function lib:sounds/hit
+execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
+execute as @s[tag=canbuy] run function item:shop/refresh_green
+tag @s remove canbuy
+
+scoreboard players set @s[scores={shop_particle=5..}] particle_type 5

data/item/functions/shop/buy/215_particle5.mcfunction

@@ -1,24 +0,0 @@
-# 炫彩粒子 (6 e)
-scoreboard players add @s shop_particle_system 0
-scoreboard players add @s shop_particle_5 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_system=1..,shop_particle_5=0,green=6..}] add canbuy
-
-tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_5=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"炫彩","color":"green"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_5=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_5=0,green=..5}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_5=0,green=..5}] at @s run function lib:sounds/error
-
-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_particle_5 1
-scoreboard players remove @s[tag=canbuy] green 6
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_5=1..}] particle_type 5

data/item/functions/shop/buy/216_particle6.mcfunction

@@ -1,24 +0,0 @@
-# 魂焰粒子 (1 eb)
-scoreboard players add @s shop_particle_system 0
-scoreboard players add @s shop_particle_6 0
-tag @s remove canbuy
-tag @s[scores={shop_particle_system=1..,shop_particle_6=0,green=9..}] add canbuy
-
-tellraw @s[scores={shop_particle_system=0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先在左侧购买尾迹特效才能切换尾迹种类!","color":"red"}]
-execute as @s[scores={shop_particle_system=0}] at @s run function lib:sounds/error
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_6=1..}] ["",{"text":">> ","color":"green","bold":true},"尾迹特效已切换为 ",{"text":"魂焰","color":"green"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_6=1..}] at @s run function lib:sounds/hit
-
-tellraw @s[scores={shop_particle_system=1..,shop_particle_6=0,green=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的绿宝石块来购买它!","color":"red"}]
-execute as @s[scores={shop_particle_system=1..,shop_particle_6=0,green=..8}] at @s run function lib:sounds/error
-
-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_particle_6 1
-scoreboard players remove @s[tag=canbuy] green 9
-execute as @s[tag=canbuy] run function item:shop/refresh_green
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
-tag @s remove canbuy
-
-scoreboard players set @s[scores={shop_particle_6=1..}] particle_type 6

data/item/functions/shop/check.mcfunction

@@ -31,14 +31,12 @@ execute if score @s buy_trigger matches 101 if score $state mem matches 0 run fu
 execute if score @s buy_trigger matches 102 if score $state mem matches 0 run function item:shop/buy/102_bgm
 execute if score @s buy_trigger matches 103 if score $state mem matches 0 run function item:shop/buy/103_pig
 # 村民尾迹商店
-execute if score @s buy_trigger matches 201 if score $state mem matches 0 run function item:shop/buy/201_particle_system
-execute if score @s buy_trigger matches 210 if score $state mem matches 0 run function item:shop/buy/210_particle_close
-execute if score @s buy_trigger matches 211 if score $state mem matches 0 run function item:shop/buy/211_particle1
-execute if score @s buy_trigger matches 212 if score $state mem matches 0 run function item:shop/buy/212_particle2
-execute if score @s buy_trigger matches 213 if score $state mem matches 0 run function item:shop/buy/213_particle3
-execute if score @s buy_trigger matches 214 if score $state mem matches 0 run function item:shop/buy/214_particle4
-execute if score @s buy_trigger matches 215 if score $state mem matches 0 run function item:shop/buy/215_particle5
-execute if score @s buy_trigger matches 216 if score $state mem matches 0 run function item:shop/buy/216_particle6
+execute if score @s buy_trigger matches 201 if score $state mem matches 0 run function item:shop/buy/201_particle_close
+execute if score @s buy_trigger matches 211 if score $state mem matches 0 run function item:shop/buy/211_particle
+execute if score @s buy_trigger matches 212 if score $state mem matches 0 run function item:shop/buy/212_particle
+execute if score @s buy_trigger matches 213 if score $state mem matches 0 run function item:shop/buy/213_particle
+execute if score @s buy_trigger matches 214 if score $state mem matches 0 run function item:shop/buy/214_particle
+execute if score @s buy_trigger matches 215 if score $state mem matches 0 run function item:shop/buy/215_particle
 # 骰子房
 execute if score @s buy_trigger matches 999 if score $state mem matches 0 run function item:shop/buy/999_dice
 # 彩蛋

data/item/functions/shop/init.mcfunction

@@ -17,9 +17,4 @@ scoreboard objectives add shop_04_float dummy
 scoreboard objectives add shop_05_axe dummy
 scoreboard objectives add shop_06_armor dummy
 scoreboard objectives add shop_07_fish dummy
-scoreboard objectives add shop_particle_system dummy
-scoreboard objectives add shop_particle_2 dummy
-scoreboard objectives add shop_particle_3 dummy
-scoreboard objectives add shop_particle_4 dummy
-scoreboard objectives add shop_particle_5 dummy
-scoreboard objectives add shop_particle_6 dummy
+scoreboard objectives add shop_particle dummy

data/ltw/functions/state/0/summon_entity.mcfunction

@@ -13,12 +13,11 @@ execute unless entity @e[type=piglin,tag=shop_piglin_10,tag=lobby_entity] run su
 # 召唤粒子房实体
 execute unless entity @e[type=villager,tag=shop_particle_1,tag=lobby_entity] run summon minecraft:villager -23 20 -73 {Tags:["lobby_entity","shop_particle_1"],CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
 execute unless entity @e[type=villager,tag=shop_particle_2,tag=lobby_entity] run summon minecraft:villager -17 20 -76 {Tags:["lobby_entity","shop_particle_2"],CustomName:'{"text":"使用生物雷达是作弊行为哦！","color":"red"}'}
-execute unless entity @e[type=armor_stand,tag=shop_particle_3,tag=lobby_entity] run summon minecraft:armor_stand -19 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["shop_particle_3","show_particle_1","lobby_entity"]}
-execute unless entity @e[type=armor_stand,tag=shop_particle_4,tag=lobby_entity] run summon minecraft:armor_stand -18 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["shop_particle_4","show_particle_2","lobby_entity"]}
-execute unless entity @e[type=armor_stand,tag=shop_particle_5,tag=lobby_entity] run summon minecraft:armor_stand -17 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["shop_particle_5","show_particle_3","lobby_entity"]}
-execute unless entity @e[type=armor_stand,tag=shop_particle_6,tag=lobby_entity] run summon minecraft:armor_stand -16 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["shop_particle_6","show_particle_4","lobby_entity"]}
-execute unless entity @e[type=armor_stand,tag=shop_particle_7,tag=lobby_entity] run summon minecraft:armor_stand -15 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["shop_particle_7","show_particle_5","lobby_entity"]}
-execute unless entity @e[type=armor_stand,tag=shop_particle_8,tag=lobby_entity] run summon minecraft:armor_stand -14 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["shop_particle_8","show_particle_6","lobby_entity"]}
+execute unless entity @e[type=armor_stand,tag=show_particle_1,tag=lobby_entity] run summon minecraft:armor_stand -19 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_1","lobby_entity"]}
+execute unless entity @e[type=armor_stand,tag=show_particle_2,tag=lobby_entity] run summon minecraft:armor_stand -18 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_2","lobby_entity"]}
+execute unless entity @e[type=armor_stand,tag=show_particle_3,tag=lobby_entity] run summon minecraft:armor_stand -17 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_3","lobby_entity"]}
+execute unless entity @e[type=armor_stand,tag=show_particle_4,tag=lobby_entity] run summon minecraft:armor_stand -16 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_4","lobby_entity"]}
+execute unless entity @e[type=armor_stand,tag=show_particle_5,tag=lobby_entity] run summon minecraft:armor_stand -15 20.1 -75 {Small:1b,Invisible:1b,Invulnerable:1b,Marker:1b,Tags:["show_particle_5","lobby_entity"]}
 execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run kill @e[type=minecart,tag=lobby_entity]
 execute unless entity @e[type=minecart,tag=lobby_entity] run kill @e[type=piglin,tag=lobby_entity,tag=shop_piglin_11]
 execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run summon minecart 4 28 -47 {Rotation:[0.0f,0.0f],Tags:["lobby_entity"],Passengers:[{id:"minecraft:piglin",Rotation:[90.0f,0.0f],Tags:["lobby_entity","shop_piglin_11"],CustomName:'{"text":"神秘老板"}',ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"gold_block",Count:1b},{}],HandDropChances:[0.0f,0.0f]}]}