Ver código fonte

将游戏改为 5 轮

LTCatt 6 anos atrás
pai
commit
4ec6b8c203

+ 1 - 1
data/ltw/functions/main/player_enter_watcher.mcfunction

@@ -22,4 +22,4 @@ execute if score $state mem matches 7 run function ltw:state/7/player_enter
 tag @s remove rejoining
 tag @s remove rejoining
 
 
 # 显示轮数提醒
 # 显示轮数提醒
-execute unless score $state mem matches 0 run tellraw @s ["",{"text":">> ","color":"aqua","bold":true},"你目前正在旁观, 游戏目前在第 ",{"score": {"name": "$round","objective": "mem"},"color": "aqua"}, {"text":"/6","color": "aqua"}," 轮, 游戏结束后就能加入啦!"]
+execute unless score $state mem matches 0 run tellraw @s ["",{"text":">> ","color":"aqua","bold":true},"你目前正在旁观, 游戏目前在第 ",{"score": {"name": "$round","objective": "mem"},"color": "aqua"}, {"text":"/5","color": "aqua"}," 轮, 游戏结束后就能加入啦!"]

+ 2 - 2
data/ltw/functions/state/3/player_enter.mcfunction

@@ -5,8 +5,8 @@ title @s actionbar ""
 # 显示 Title
 # 显示 Title
 title @s times 5 53 2
 title @s times 5 53 2
 title @s subtitle ""
 title @s subtitle ""
-execute if score $round mem matches ..5 run title @s title ["第 ",{"score": {"objective": "mem","name": "$round"}},"/6 轮"]
-execute if score $round mem matches 6 run title @s title {"text":"最终轮","color":"gold"}
+execute if score $round mem matches ..4 run title @s title ["第 ",{"score": {"objective": "mem","name": "$round"}},"/5 轮"]
+execute if score $round mem matches 5 run title @s title {"text":"最终轮","color":"gold"}
 
 
 # 状态效果
 # 状态效果
 effect clear @s
 effect clear @s

+ 2 - 2
data/ltw/functions/state/7/next.mcfunction

@@ -18,8 +18,8 @@ execute unless entity @a[tag=new_selector] if entity @a[tag=selecting] run tellr
 
 
 # 以玩家为对象开始执行
 # 以玩家为对象开始执行
 execute as @a[tag=new_selector] run function ltw:state/7/next2
 execute as @a[tag=new_selector] run function ltw:state/7/next2
-execute unless entity @a[tag=new_selector] if score $game_type mem matches 1 if score $round mem matches 6.. run function ltw:main/game_end
-execute unless entity @a[tag=new_selector] if score $game_type mem matches 1 if score $round mem matches ..5 run function ltw:state/7/continue_gameparty
+execute unless entity @a[tag=new_selector] if score $game_type mem matches 1 if score $round mem matches 5.. run function ltw:main/game_end
+execute unless entity @a[tag=new_selector] if score $game_type mem matches 1 if score $round mem matches ..4 run function ltw:state/7/continue_gameparty
 
 
 # 初始化倒计时与 HUD
 # 初始化倒计时与 HUD
 scoreboard players set $countdown mem 10
 scoreboard players set $countdown mem 10

+ 2 - 2
data/test/functions/fast_countdown.mcfunction

@@ -1,4 +1,4 @@
-# 测试用:将倒计时修改为 1 秒
+# 测试用:将倒计时修改为立即结束
 
 
 scoreboard players set $countdown mem 1
 scoreboard players set $countdown mem 1
-scoreboard players set $countdown_fast mem 10
+scoreboard players set $countdown_fast mem 5

+ 0 - 7
data/test/functions/generate_bonus.mcfunction

@@ -1,7 +0,0 @@
-# 刷新奖励房间
-
-tag @a remove watcher
-scoreboard players set $game_type mem 1
-scoreboard players set $round mem 4
-function ltw:state/6/state_enter
-schedule function test:generate_bonus2 3t

+ 0 - 3
data/test/functions/generate_bonus2.mcfunction

@@ -1,3 +0,0 @@
-
-function ltw:state/7/state_enter
-scoreboard players set $state mem 0

+ 1 - 1
data/test/functions/mini/colormatch.mcfunction

@@ -3,7 +3,7 @@ tag @a add lobby_ready
 tag @a remove lobby_watch
 tag @a remove lobby_watch
 tag @a remove watcher
 tag @a remove watcher
 function ltw:state/0/start_gameparty
 function ltw:state/0/start_gameparty
-scoreboard players set $round mem 6
+scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 4
 scoreboard players set $mini_type mem 4
 function mini:main/game_init
 function mini:main/game_init
 function ltw:state/4/state_enter
 function ltw:state/4/state_enter

+ 1 - 1
data/test/functions/mini/hotpm.mcfunction

@@ -3,7 +3,7 @@ tag @a add lobby_ready
 tag @a remove lobby_watch
 tag @a remove lobby_watch
 tag @a remove watcher
 tag @a remove watcher
 function ltw:state/0/start_gameparty
 function ltw:state/0/start_gameparty
-scoreboard players set $round mem 6
+scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 3
 scoreboard players set $mini_type mem 3
 function mini:main/game_init
 function mini:main/game_init
 function ltw:state/4/state_enter
 function ltw:state/4/state_enter

+ 1 - 1
data/test/functions/mini/parkour.mcfunction

@@ -3,7 +3,7 @@ tag @a add lobby_ready
 tag @a remove lobby_watch
 tag @a remove lobby_watch
 tag @a remove watcher
 tag @a remove watcher
 function ltw:state/0/start_gameparty
 function ltw:state/0/start_gameparty
-scoreboard players set $round mem 6
+scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 1
 scoreboard players set $mini_type mem 1
 function mini:main/game_init
 function mini:main/game_init
 function ltw:state/4/state_enter
 function ltw:state/4/state_enter

+ 1 - 1
data/test/functions/mini/phantom.mcfunction

@@ -3,7 +3,7 @@ tag @a add lobby_ready
 tag @a remove lobby_watch
 tag @a remove lobby_watch
 tag @a remove watcher
 tag @a remove watcher
 function ltw:state/0/start_gameparty
 function ltw:state/0/start_gameparty
-scoreboard players set $round mem 6
+scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 5
 scoreboard players set $mini_type mem 5
 function mini:main/game_init
 function mini:main/game_init
 function ltw:state/4/state_enter
 function ltw:state/4/state_enter

+ 1 - 1
data/test/functions/mini/tntrun.mcfunction

@@ -3,7 +3,7 @@ tag @a add lobby_ready
 tag @a remove lobby_watch
 tag @a remove lobby_watch
 tag @a remove watcher
 tag @a remove watcher
 function ltw:state/0/start_gameparty
 function ltw:state/0/start_gameparty
-scoreboard players set $round mem 6
+scoreboard players set $round mem 5
 scoreboard players set $mini_type mem 2
 scoreboard players set $mini_type mem 2
 function mini:main/game_init
 function mini:main/game_init
 function ltw:state/4/state_enter
 function ltw:state/4/state_enter