Forráskód Böngészése

Merge branch 'master' of github.com:LTCatt/LTW3

HerobrineXia 6 éve
szülő
commit
34adc295f8

+ 1 - 1
data/mini/functions/main/player_failed.mcfunction

@@ -4,7 +4,7 @@
 tag @s remove mini_running
 scoreboard players set $t_alive mem 0
 execute as @a[tag=mini_running] run scoreboard players add $t_alive mem 1
-tellraw @a [{"selector": "@s","color":"red"}," 已失败! 剩余 ",{"score": {"name": "$alive","objective": "mem"}}," 人!"]
+tellraw @a [{"selector": "@s","color":"red"}," 已失败! 剩余 ",{"score": {"name": "$t_alive","objective": "mem"}}," 人!"]
 
 # 给存活的玩家加分
 scoreboard players add @a[tag=mini_running] mini_score 1

+ 1 - 1
data/mini/functions/main/show_result.mcfunction

@@ -1,3 +1,3 @@
 # 显示小游戏排名
 
-tellraw @s [{"text":"\n>> 小游戏结束 >>\n\n","color":"gold","bold":true},{"text": "第一名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank1]"},{"text": "第二名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank2]","color":"white","bold": false},{"text": "第三名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank3]","color":"white","bold": false},"\n"]
+tellraw @s [{"text":"\n>> 小游戏结束 >>\n\n","color":"gold","bold":true},{"text": "第一名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank1]","color":"white","bold": false},{"text": "\n第二名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank2]","color":"white","bold": false},{"text": "\n第三名 - ","color":"green","bold": false},{"selector": "@a[tag=mini_rank3]","color":"white","bold": false},"\n"]

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

@@ -0,0 +1,7 @@
+# 测试用:快速开始跑酷
+
+scoreboard players set $mini_type mem 1
+function mini:main/game_init
+function ltw:state/4/state_enter
+scoreboard players set $countdown mem 6
+say 已开始跑酷!

+ 1 - 1
data/test/functions/start_random.mcfunction

@@ -2,5 +2,5 @@
 
 function ltw:state/3/state_enter
 function ltw:state/4/state_enter
-scoreboard players set $countdown mem 5
+scoreboard players set $countdown mem 6
 say 已开始随机小游戏!

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

@@ -0,0 +1,7 @@
+# 测试用:快速开始 TNT Run
+
+scoreboard players set $mini_type mem 2
+function mini:main/game_init
+function ltw:state/4/state_enter
+scoreboard players set $countdown mem 6
+say 已开始 TNT Run!