Parcourir la source

又是各种调整

龙腾猫跃 il y a 3 ans
Parent
commit
a5c963cb36

+ 1 - 1
data/ltw/advancements/blood/phantom1.json

@@ -8,7 +8,7 @@
         "text": "不再有梦 · α "
         "text": "不再有梦 · α "
       },
       },
       "description": [
       "description": [
-        {"text": "【月夜狩猎】击杀 8 只幻翼\n", "color":"gray"},
+        {"text": "【月夜狩猎】击杀 7 只幻翼\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
         {"text": "1 绿宝石","color":"white"}
       ],
       ],

+ 1 - 1
data/ltw/advancements/blood/phantom2.json

@@ -8,7 +8,7 @@
         "text": "不再有梦 · β "
         "text": "不再有梦 · β "
       },
       },
       "description": [
       "description": [
-        {"text": "【月夜狩猎】击杀 16 只幻翼\n", "color":"gray"},
+        {"text": "【月夜狩猎】击杀 14 只幻翼\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
         {"text": "2 绿宝石","color":"white"}
       ],
       ],

+ 1 - 1
data/ltw/advancements/blood/phantom3.json

@@ -8,7 +8,7 @@
         "text": "不再有梦 · γ "
         "text": "不再有梦 · γ "
       },
       },
       "description": [
       "description": [
-        {"text": "【月夜狩猎】击杀 24 只幻翼\n", "color":"gray"},
+        {"text": "【月夜狩猎】击杀 21 只幻翼\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
         {"text": "2 绿宝石","color":"white"}
       ],
       ],

+ 1 - 1
data/ltw/advancements/blood/phantom4.json

@@ -8,7 +8,7 @@
         "text": "不再有梦 · Ω "
         "text": "不再有梦 · Ω "
       },
       },
       "description": [
       "description": [
-        {"text": "【月夜狩猎】击杀 32 只幻翼\n", "color":"gray"},
+        {"text": "【月夜狩猎】击杀 28 只幻翼\n", "color":"gray"},
         {"text": "究极隐藏挑战!","color":"dark_gray","italic": true}
         {"text": "究极隐藏挑战!","color":"dark_gray","italic": true}
       ],
       ],
       "frame": "challenge",
       "frame": "challenge",

+ 3 - 1
data/mini/functions/ass/game/new_item.mcfunction

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

+ 1 - 1
data/mini/functions/ass/player_death.mcfunction

@@ -10,4 +10,4 @@ function mini:main/player_failed
 # execute unless entity @a[tag=mini_running] run function mini:main/game_end
 # execute unless entity @a[tag=mini_running] run function mini:main/game_end
 
 
 execute if score $player_alive mem matches 2 if score $countdown mem matches 2.. run effect clear @a resistance
 execute if score $player_alive mem matches 2 if score $countdown mem matches 2.. run effect clear @a resistance
-execute if score $player_alive mem matches 2 if score $countdown mem matches 2.. run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "苦力怕现在会造成更多伤害!","color": "gold"}]
+execute if score $player_alive mem matches 2 if score $countdown mem matches 2.. run tellraw @a ["\n",{"text": ">> ","color": "gold","bold": true},{"text": "苦力怕现在会造成更多伤害!\n","color": "gold"}]

+ 2 - 2
data/mini/functions/ass/tick20.mcfunction

@@ -1,13 +1,13 @@
 
 
 # 强制死亡机制
 # 强制死亡机制
 execute if score $countdown mem matches 21 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "强制死亡将在 20 秒后开启!","color": "gold"}]
 execute if score $countdown mem matches 21 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "强制死亡将在 20 秒后开启!","color": "gold"}]
-execute if score $countdown mem matches 1 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "强制死亡已开启!","color": "gold"}]
 execute if score $countdown mem matches 1 run scoreboard players set $bossbar_color mem 1
 execute if score $countdown mem matches 1 run scoreboard players set $bossbar_color mem 1
 execute if score $countdown mem matches 1 run function lib:bossbar/show
 execute if score $countdown mem matches 1 run function lib:bossbar/show
 execute if score $countdown mem matches 1 as @a at @s run function lib:sounds/music/mini_fast
 execute if score $countdown mem matches 1 as @a at @s run function lib:sounds/music/mini_fast
 execute if score $countdown mem matches 1 as @a at @s run function lib:sounds/dragon_growl
 execute if score $countdown mem matches 1 as @a at @s run function lib:sounds/dragon_growl
 execute if score $countdown mem matches 1 if score $player_alive mem matches 3.. run effect clear @a resistance
 execute if score $countdown mem matches 1 if score $player_alive mem matches 3.. run effect clear @a resistance
-execute if score $countdown mem matches 1 if score $player_alive mem matches 3.. run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "苦力怕现在会造成更多伤害!","color": "gold"}]
+execute if score $countdown mem matches 1 if score $player_alive mem matches ..2 run tellraw @a ["\n",{"text": ">> ","color": "gold","bold": true},{"text": "强制死亡已开启!\n","color": "gold"}]
+execute if score $countdown mem matches 1 if score $player_alive mem matches 3.. run tellraw @a ["\n",{"text": ">> ","color": "gold","bold": true},{"text": "强制死亡已开启!苦力怕现在会造成更多伤害!\n","color": "gold"}]
 execute if score $countdown mem matches ..0 run effect give @a[team=playing] wither 1000000 1 true
 execute if score $countdown mem matches ..0 run effect give @a[team=playing] wither 1000000 1 true
 
 
 # 回复生命值
 # 回复生命值

+ 3 - 1
data/mini/functions/colormatch/game/new_item.mcfunction

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

+ 3 - 1
data/mini/functions/colormatch/game/reach_max_speed.mcfunction

@@ -1,4 +1,6 @@
 advancement grant @a[tag=mini_running] only ltw:vs/colormatch1
 advancement grant @a[tag=mini_running] only ltw:vs/colormatch1
-tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "色彩迷阵的切换速度已达满速!","color":"gold"}]
+title @a subtitle {"text":"⚜ 切换速度已达满速 ⚜","color":"gold"}
+title @a times 1 60 3
+title @a title ""
 playsound minecraft:entity.ender_dragon.growl player @a 0 1000000 0 1000000 1.5
 playsound minecraft:entity.ender_dragon.growl player @a 0 1000000 0 1000000 1.5
 scoreboard players set #max_speed mem 1
 scoreboard players set #max_speed mem 1

+ 3 - 1
data/mini/functions/hotpm/game/new_item.mcfunction

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

+ 1 - 1
data/mini/functions/iron/game_init3.mcfunction

@@ -23,4 +23,4 @@ fill 1000 319 5000 1032 290 5032 air
 fill 1000 289 5000 1032 271 5032 air
 fill 1000 289 5000 1032 271 5032 air
 fill 1000 270 5000 1032 255 5032 air
 fill 1000 270 5000 1032 255 5032 air
 
 
-schedule function mini:iron/game_init4 1t
+schedule function mini:iron/game_init4 10t

+ 0 - 1
data/mini/functions/iron/game_init4.mcfunction

@@ -1,3 +1,2 @@
 # 清理箱子重叠时产生的物品
 # 清理箱子重叠时产生的物品
 kill @e[type=item]
 kill @e[type=item]
-

+ 19 - 5
data/mini/functions/iron/tick20.mcfunction

@@ -5,17 +5,31 @@ execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"na
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
 
-# 170s:关闭循环播放
-execute if score $countdown mem matches 170 run scoreboard players set @a music_time 999
+# 120s:时间提示
+execute if score $countdown mem matches 120 run title @a subtitle {"text":"⚠ 还剩两分钟! ⚠","color":"yellow"}
+execute if score $countdown mem matches 120 run title @a times 1 50 3
+execute if score $countdown mem matches 120 run title @a title ""
 
 
-# 90s / 60s:雷达提示
-execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text":"玩家雷达将在 ","color": "gold"}, "30 秒 ",{"text": "后开启","color": "gold"}]
+# 90s:雷达提示
+execute if score $countdown mem matches 90 run title @a subtitle {"text":"⚠ 玩家雷达将在三十秒后开启! ⚠","color":"yellow"}
+execute if score $countdown mem matches 90 run title @a times 1 100 3
+execute if score $countdown mem matches 90 run title @a title ""
 execute if score $countdown mem matches 90 run scoreboard players set $bossbar_color mem 2
 execute if score $countdown mem matches 90 run scoreboard players set $bossbar_color mem 2
 execute if score $countdown mem matches 90 run function lib:bossbar/show
 execute if score $countdown mem matches 90 run function lib:bossbar/show
+
+# 60s:雷达开启
 execute if score $countdown mem matches 61 as @a run function lib:sounds/music/mini_fast
 execute if score $countdown mem matches 61 as @a run function lib:sounds/music/mini_fast
-execute if score $countdown mem matches 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "玩家雷达已开启, 游戏将在 ","color": "gold"},"60 秒 ", {"text": "后结束","color": "gold"}]
+execute if score $countdown mem matches 60 run title @a subtitle {"text":"⚠ 玩家雷达已开启!还剩一分钟! ⚠","color":"red"}
+execute if score $countdown mem matches 60 run title @a times 1 120 3
+execute if score $countdown mem matches 60 run title @a title ""
 execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 1
 execute if score $countdown mem matches 60 run scoreboard players set $bossbar_color mem 1
 execute if score $countdown mem matches 60 run function lib:bossbar/show
 execute if score $countdown mem matches 60 run function lib:bossbar/show
+execute if score $countdown mem matches 60 run playsound minecraft:entity.ender_dragon.growl player @a 0 1000000 0 1000000 1.5
+
+# 30s:时间提示
+execute if score $countdown mem matches 30 run title @a subtitle {"text":"⚠ 还剩三十秒! ⚠","color":"yellow"}
+execute if score $countdown mem matches 30 run title @a times 1 50 3
+execute if score $countdown mem matches 30 run title @a title ""
 
 
 # 0s:游戏结束
 # 0s:游戏结束
 execute if score $countdown mem matches 0 run function mini:main/game_end
 execute if score $countdown mem matches 0 run function mini:main/game_end

+ 1 - 1
data/mini/functions/phantom/game/new_item.mcfunction

@@ -2,4 +2,4 @@ function item:bonus_item/gameparty/auto/low
 execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.7,0.0]}
 execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.7,0.0]}
 particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
 particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
 kill @s
 kill @s
-tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "红色幻翼已被击杀!","color":"gold"}]
+tellraw @a ["\n",{"text": ">> ","color":"gold","bold": true},{"text": "红色幻翼已被击杀!\n","color":"gold"}]

+ 3 - 1
data/mini/functions/phantom/game/summon2.mcfunction

@@ -6,7 +6,9 @@ attribute @e[tag=new_phantom,limit=1] generic.max_health base set 2
 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 4
 
 
 # 如果满足条件(在 tick20 中检查),则刷出奖励幻翼
 # 如果满足条件(在 tick20 中检查),则刷出奖励幻翼
-execute if score #new_item mem matches 0 run tellraw @a ["\n",{"text": ">> ","color":"gold","bold": true},{"text": "击杀红色幻翼, 获取奖励物资!\n","color":"gold"}]
+execute if score #new_item mem matches 0 run title @a subtitle {"text":"❇ 击杀红色幻翼, 获取奖励物资 ❇","color":"red"}
+execute if score #new_item mem matches 0 run title @a times 1 80 3
+execute if score #new_item mem matches 0 run title @a title ""
 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 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 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
 execute if score #new_item mem matches 0 run scoreboard players set $new_item_cd mem 0

+ 4 - 4
data/mini/functions/phantom/tick20.mcfunction

@@ -1,8 +1,8 @@
 # 给予进度
 # 给予进度
-execute as @a[team=playing,scores={temp=1..,kill_phantom=8}] run advancement grant @s only ltw:blood/phantom1
-execute as @a[team=playing,scores={temp=1..,kill_phantom=16}] run advancement grant @s only ltw:blood/phantom2
-execute as @a[team=playing,scores={temp=1..,kill_phantom=24}] run advancement grant @s only ltw:blood/phantom3
-execute as @a[team=playing,scores={temp=1..,kill_phantom=32}] run advancement grant @s only ltw:blood/phantom4
+execute as @a[team=playing,scores={temp=1..,kill_phantom=7}] run advancement grant @s only ltw:blood/phantom1
+execute as @a[team=playing,scores={temp=1..,kill_phantom=14}] run advancement grant @s only ltw:blood/phantom2
+execute as @a[team=playing,scores={temp=1..,kill_phantom=21}] run advancement grant @s only ltw:blood/phantom3
+execute as @a[team=playing,scores={temp=1..,kill_phantom=28}] run advancement grant @s only ltw:blood/phantom4
 
 
 # 判断是否符合刷出新物品的条件:0 为可以,其他为不可以
 # 判断是否符合刷出新物品的条件:0 为可以,其他为不可以
 scoreboard players set #new_item mem 0
 scoreboard players set #new_item mem 0

+ 1 - 1
data/mini/functions/trade/game_init3.mcfunction

@@ -23,4 +23,4 @@ fill 1000 319 5000 1032 290 5032 air
 fill 1000 289 5000 1032 271 5032 air
 fill 1000 289 5000 1032 271 5032 air
 fill 1000 270 5000 1032 255 5032 air
 fill 1000 270 5000 1032 255 5032 air
 
 
-schedule function mini:trade/game_init4 1t
+schedule function mini:trade/game_init4 10t

+ 0 - 1
data/mini/functions/trade/game_init4.mcfunction

@@ -1,3 +1,2 @@
 # 清理箱子重叠时产生的物品
 # 清理箱子重叠时产生的物品
 kill @e[type=item]
 kill @e[type=item]
-

+ 10 - 0
data/mini/functions/trade/tick20.mcfunction

@@ -8,6 +8,16 @@ execute if score $countdown mem matches ..10 run title @a subtitle {"score":{"na
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 run title @a title [""]
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds/hit2
 
 
+# 120s:时间提示
+execute if score $countdown mem matches 120 run title @a subtitle {"text":"⚠ 还剩两分钟! ⚠","color":"yellow"}
+execute if score $countdown mem matches 120 run title @a times 1 50 3
+execute if score $countdown mem matches 120 run title @a title ""
+
+# 30s:时间提示
+execute if score $countdown mem matches 30 run title @a subtitle {"text":"⚠ 还剩三十秒! ⚠","color":"yellow"}
+execute if score $countdown mem matches 30 run title @a times 1 50 3
+execute if score $countdown mem matches 30 run title @a title ""
+
 # 升级
 # 升级
 execute as @e[tag=TradePlayer] run function mini:trade/game/villager_try_level_up
 execute as @e[tag=TradePlayer] run function mini:trade/game/villager_try_level_up