杂项调整

data/mini/functions/colormatch/game/new_item.mcfunction

@@ -1,4 +1,4 @@
-tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "新的奖励物资已在空中部署！","color":"aqua"}]
+tellraw @a ["\n",{"text": ">> ","color":"aqua","bold": true},{"text": "新的奖励物资已在空中部署！\n","color":"aqua"}]
 playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
 scoreboard players set $new_item_cd mem 0
 

data/mini/functions/hotpm/game/new_item.mcfunction

@@ -1,4 +1,4 @@
-tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "新的奖励物资已在空中部署！","color":"aqua"}]
+tellraw @a ["\n",{"text": ">> ","color":"aqua","bold": true},{"text": "新的奖励物资已在空中部署！\n","color":"aqua"}]
 playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
 scoreboard players set $new_item_cd mem 0
 

data/mini/functions/phantom/game/give_trident.mcfunction

@@ -4,4 +4,5 @@ clear @s trident{game_item:1b}
 execute if data entity @s Inventory[{Slot:8b}] run scoreboard players set @s item_slot 8
 execute if data entity @s Inventory[{Slot:8b}] at @s run function item:pop_slot/return_item
 
-item replace entity @s hotbar.8 with trident{Damage:248,game_item:1b,display:{Name:'{"text":"补给用三叉戟","italic":false}'}} 1
+item replace entity @s hotbar.8 with trident{Damage:248,game_item:1b,display:{Name:'{"text":"补给用三叉戟","italic":false}'}} 1
+scoreboard players set @s countdown_fast -1

data/mini/functions/phantom/game/summon.mcfunction

@@ -1,5 +1,5 @@
 # 召唤幻翼
 
-summon phantom 1030 255 6030 {Tags:["new_phantom"]}
+summon phantom 1030 255 6030 {Tags:["new_phantom"],AX:1030,AY:26,AZ:6031}
 spreadplayers 1030 6030 20 20 false @e[tag=new_phantom]
 schedule function mini:phantom/game/summon2 1t replace

data/mini/functions/phantom/game/summon2.mcfunction

@@ -8,10 +8,10 @@ function lib:random
 execute if score $random mem matches 1 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 2
 execute if score $random mem matches 2 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 3
 execute if score $random mem matches 3 run attribute @e[tag=new_phantom,limit=1] generic.max_health base set 4
-attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 4
+attribute @e[tag=new_phantom,limit=1] generic.attack_damage base set 3
 
 # 如果满足条件（在 tick20 中检查），则刷出奖励幻翼
-execute if score #new_item mem matches 0 run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"text": "击杀红色幻翼, 获取奖励物资！","color":"aqua"}]
+execute if score #new_item mem matches 0 run tellraw @a ["\n",{"text": ">> ","color":"aqua","bold": true},{"text": "击杀红色幻翼, 获取奖励物资！\n","color":"aqua"}]
 execute if score #new_item mem matches 0 run playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
 execute if score #new_item mem matches 0 run tag @e[tag=new_phantom] add bonus_phantom
 execute if score #new_item mem matches 0 run scoreboard players set $new_item_cd mem 0
@@ -19,9 +19,10 @@ execute if score #new_item mem matches 0 run scoreboard players set $new_item_cd
 # 修改奖励幻翼的属性
 team join red @e[tag=bonus_phantom,tag=new_phantom,limit=1]
 effect give @e[tag=bonus_phantom,tag=new_phantom,limit=1] glowing 1000000 0 true
+data modify entity @e[tag=bonus_phantom,tag=new_phantom,limit=1] Size set value 4
 attribute @e[tag=bonus_phantom,tag=new_phantom,limit=1] generic.max_health base set 20
 
 # 确认属性修改
-effect give @e[tag=new_phantom] instant_damage
+effect give @e[tag=new_phantom] instant_damage 1 10 true
 
 tag @e[tag=new_phantom] remove new_phantom

data/mini/functions/phantom/game/use_trident.mcfunction

@@ -1,5 +1,5 @@
 # 设置玩家分数
-scoreboard players set @s countdown_fast 20
+scoreboard players set @s countdown_fast 14
 scoreboard players reset @s use_trident
 
 # 清除三叉戟以防bug

data/mini/functions/phantom/game_init2.mcfunction

@@ -4,5 +4,5 @@ function mini:main/kill_entity
 tp @e[type=phantom] 1000 -100 6000
 
 # 生成奖励物品
-execute positioned 1034.0 27.5 6058.5 run function item:bonus_item/gameparty/auto/normal
-execute positioned 1035.0 28.5 6002.5 run function item:bonus_item/gameparty/auto/normal
+execute positioned 1032.5 22.1 6008.0 run function item:bonus_item/gameparty/auto/low2
+execute positioned 1032.0 21.1 6053.0 run function item:bonus_item/gameparty/auto/low2

data/mini/functions/phantom/player_enter.mcfunction

@@ -15,11 +15,12 @@ scoreboard players reset @s kill_phantom
 scoreboard players reset @s kill_phantom2
 scoreboard players set @s[team=playing,tag=!rejoining] kill_phantom 0
 scoreboard players set @s[team=playing,tag=!rejoining] kill_phantom2 0
+scoreboard players set @s[team=playing,tag=!rejoining] countdown_fast 0
 scoreboard players reset @s use_trident
 scoreboard players reset @s countdown
 
 # 传送玩家
-tp @s[team=playing] 1030.5 24.5 6031.5
+spreadplayers 1030 6031 3 3 under 18 false @s[team=playing]
 
 # 调整模式
 gamemode spectator @s[team=!debugging]

data/mini/functions/phantom/tick2.mcfunction

@@ -2,7 +2,7 @@
 execute as @a[tag=mini_running] if score @s use_trident matches 1.. run function mini:phantom/game/use_trident
 
 # 给予三叉戟
-execute as @a[tag=mini_running] unless data entity @s Inventory[{Slot:8b,id:"minecraft:trident",tag:{game_item:1b}}] unless score @s countdown_fast matches 1.. run function mini:phantom/game/give_trident
+execute as @a[tag=mini_running,scores={countdown_fast=0}] unless data entity @s Inventory[{Slot:8b,id:"minecraft:trident",tag:{game_item:1b}}] run function mini:phantom/game/give_trident
 
 # 更改丢出的三叉戟的nbt
 execute as @e[type=trident,tag=!fixed_trident] run function mini:phantom/game/fix_trident