浏览代码

再次修复初始化……sbmj

龙腾猫跃 3 年之前
父节点
当前提交
f224891565

+ 0 - 1
data/ltw/functions/state/7/player_enter.mcfunction

@@ -6,7 +6,6 @@ title @s actionbar ""
 effect clear @s
 effect clear @s
 effect give @s saturation 1000000 0 true
 effect give @s saturation 1000000 0 true
 gamerule naturalRegeneration true
 gamerule naturalRegeneration true
-#effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
 effect give @s resistance 1000000 4 true
 
 
 # 传送玩家
 # 传送玩家

+ 1 - 4
data/mini/functions/ass/player_enter.mcfunction

@@ -4,10 +4,7 @@ title @s clear
 title @s actionbar ""
 title @s actionbar ""
 
 
 # 状态效果
 # 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-effect give @s night_vision 1000000 0 true
-effect give @s resistance 1000000 2 true
+function mini:ass/give_effect
 
 
 # 设置玩家生命
 # 设置玩家生命
 attribute @s generic.max_health base set 20
 attribute @s generic.max_health base set 20

+ 1 - 1
data/mini/functions/colormatch/game/generate_parts.mcfunction

@@ -9,7 +9,7 @@ execute if score $floor_generate_part mem matches 5 positioned 1000 10 4000 run
 execute if score $floor_generate_part mem matches 6 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_6",integrity:0.16666666666666666f}
 execute if score $floor_generate_part mem matches 6 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_6",integrity:0.16666666666666666f}
 execute if score $floor_generate_part mem matches 7 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_7",integrity:0.14285714285714285f}
 execute if score $floor_generate_part mem matches 7 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_7",integrity:0.14285714285714285f}
 execute if score $floor_generate_part mem matches 8 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_8",integrity:0.125f}
 execute if score $floor_generate_part mem matches 8 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_8",integrity:0.125f}
-execute if score $floor_generate_part mem matches 9 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_9",integrity:0.005f}
+execute if score $floor_generate_part mem matches 9 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_9",integrity:0.01f}
 # execute if score $floor_generate_part mem matches 11 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_11",integrity:0.09090909090909091f}
 # execute if score $floor_generate_part mem matches 11 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_11",integrity:0.09090909090909091f}
 # execute if score $floor_generate_part mem matches 12 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_12",integrity:0.08333333333333333f}
 # execute if score $floor_generate_part mem matches 12 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_12",integrity:0.08333333333333333f}
 # execute if score $floor_generate_part mem matches 13 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_13",integrity:0.07692307692307693f}
 # execute if score $floor_generate_part mem matches 13 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_13",integrity:0.07692307692307693f}

+ 1 - 0
data/mini/functions/colormatch/game/remove_ground.mcfunction

@@ -11,6 +11,7 @@ execute as @a at @s run function lib:sounds/hit2
 scoreboard players set $countdown_fast mem 28
 scoreboard players set $countdown_fast mem 28
 scoreboard players operation $countdown_fast mem < $color_match_time mem
 scoreboard players operation $countdown_fast mem < $color_match_time mem
 scoreboard players remove $countdown_fast mem 3
 scoreboard players remove $countdown_fast mem 3
+execute if score $countdown_fast mem matches ..16 run scoreboard players set $countdown_fast mem 17
 scoreboard players set $color_match_type mem 1
 scoreboard players set $color_match_type mem 1
 
 
 # HUD
 # HUD

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

@@ -23,5 +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
 
 
-# 清理箱子重叠时产生的物品
-kill @e[type=item]
+schedule function mini:iron/game_init4 1t

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

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

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

@@ -23,5 +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
 
 
-# 清理箱子重叠时产生的物品
-kill @e[type=item]
+schedule function mini:trade/game_init4 1t

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

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