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

data/mini/functions/main/player_failed.mcfunction

@@ -5,7 +5,7 @@ tag @s remove mini_running
 function mini:main/update_player_count
 
 # 显示提示
-execute if entity @s[tag=!rejoining] if score $player_alive mem matches 1.. run tellraw @a ["",{"text": ">> ","color":"red","bold":true},{"selector": "@s","color":"red"}," 已淘汰! 还剩 ",{"score": {"name": "$player_alive","objective": "mem"}}," 人!"]
+execute if entity @s[tag=!rejoining] if score $player_alive mem matches 1.. run tellraw @a ["",{"text": ">> ","color":"red","bold":true},{"selector": "@s","color":"red"}," 已死亡! 还剩 ",{"score": {"name": "$player_alive","objective": "mem"}}," 人!"]
 execute as @a at @s run function lib:sounds/error
 
 # 给存活的玩家加分

data/mini/functions/phantom/game_init.mcfunction

@@ -2,6 +2,8 @@
 forceload add 1000 6000 1064 6064
 
 scoreboard players set $finish_mode mem 0
+scoreboard players reset * kill_phantom
+scoreboard players reset * kill_phantom2
 
 # 调整时间
 time set 21000t

data/mini/functions/phantom/game_start.mcfunction

@@ -1,4 +1,2 @@
 gamerule doDaylightCycle true
 scoreboard players set $countdown mem 110
-scoreboard players reset * kill_phantom
-scoreboard players reset * kill_phantom2

data/mini/functions/phantom/player_failed.mcfunction

@@ -1,5 +1,6 @@
 # 玩家死亡时由玩家自己触发
 
+tag @s remove mini_running
 gamemode spectator
 tp @s[tag=!debug] 1062.34 27.11 6040.84 461.44 28.30
 tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]

data/mini/functions/slime/game/set_attack.mcfunction

@@ -1 +1 @@
-execute as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 2
+execute as @e[type=slime] run attribute @s minecraft:generic.attack_damage base set 1.9

data/mini/functions/slime/game_init.mcfunction

@@ -2,6 +2,7 @@
 forceload add 1000 7000 1064 7064
 
 scoreboard players set $finish_mode mem 0
+scoreboard players reset * slime_score
 
 # 生成地图
 setblock 1000 4 7000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:slime",sizeY:7,sizeZ:32,showboundingbox:0b}

data/mini/functions/slime/game_start.mcfunction

@@ -1,3 +1,2 @@
 function mini:slime/game/summon
-scoreboard players set $countdown mem 120
-scoreboard players reset * slime_score
+scoreboard players set $countdown mem 100

data/mini/functions/slime/player_failed.mcfunction

@@ -1,6 +1,3 @@
 # 玩家死亡时由玩家自己触发
-gamemode spectator
-effect give @s night_vision 1000000 0 true
-tellraw @a ["",{"text": ">> ","color":"red","bold": true},{"selector": "@s","color":"red"}," 已死亡!"]
-execute as @a at @s run function lib:sounds/error
-execute unless entity @a[gamemode=adventure] run function mini:main/game_end
+function mini:main/player_failed
+effect give @s night_vision 1000000 0 true