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

data/mini/functions/diamond/game_init.mcfunction

@@ -6,7 +6,7 @@ scoreboard players set $finish_mode mem 0
 scoreboard players set $survival mem 1
 
 # 调整时间
-time set 9800t
+time set 9000t
 
 # 生成地图
 setblock 1000 255 5000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,author:"LTCat",rotation:"NONE",posX:0,mode:"LOAD",posY:-24,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:diamond_base",sizeY:25,sizeZ:32,showboundingbox:1b}

data/mini/functions/diamond/game_init2.mcfunction

@@ -1,6 +1,6 @@
 
 # 矿物生成
-fill 1028 252 5030 1028 252 5027 minecraft:redstone_block
+setblock 1028 252 5030 minecraft:redstone_block
 
 # 地牢 1 生成
 scoreboard players set $random_max mem 4

data/mini/functions/diamond/player_intro.mcfunction

@@ -3,5 +3,5 @@ tp @s[team=!debugging] 1013.47 247.63 5045.62 -178.86 17.18
 tellraw @s ["",{"text":"\n >> 钻石风暴 >>\n\n","color":"gold","bold":true}," 制作铁镐, 挖取钻石, 然后保住自己的小命!\n 不过, 或许也可以去地牢碰碰运气……\n"]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"太阳落山时游戏即会结束, 然后根据持有的钻石数排名。","color":"gray"}]
 tellraw @s ["",{"text": " <PVP> ","color":"light_purple","bold": true}, {"text":"死亡会掉落一半物品, 被击杀后能立即复活。","color":"gray"}]
-tellraw @s ["",{"text": " <早期测试> ","color":"dark_red","bold": true}, {"text":"此游戏目前尚在早期测试, 可能非常不稳定!","color":"dark_red"}]
+tellraw @s ["",{"text": " <原型> ","color":"gold","bold": true}, {"text":"此游戏目前仅用于玩法测试, 尚未进行修缮。","color":"gray"}]
 tellraw @s ""

data/mini/functions/diamond/tick20.mcfunction

@@ -9,10 +9,10 @@ execute if score $countdown mem matches ..10 as @a at @s run function lib:sounds
 execute if score $countdown mem matches 170 run scoreboard players set @a music_time 999
 
 # 90s / 60s：雷达提示
-execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text":"玩家雷达将在 ","color": "gold"}, "30 秒 ",{"text": "后开启!","color": "gold"}]
+execute if score $countdown mem matches 90 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text":"玩家雷达将在 ","color": "gold"}, "30 秒 ",{"text": "后开启","color": "gold"}]
 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 60 run tellraw @a ["",{"text": ">> ","color": "gold","bold": true},{"text": "玩家雷达已开启, 游戏将在 ","color": "gold"},"60 秒 ", {"text": "后结束!","color": "gold"}]
+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 as @a run function lib:sounds/music/mini_fast
 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

data/mini/functions/diamond/tick5.mcfunction

@@ -5,7 +5,7 @@ execute if score $countdown mem matches ..60 run effect give @a glowing 1000000
 # effect give @a[scores={diamond=1..}] glowing 5 0 true
 
 # 显示提示
-execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=253,dz=32] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s"},{"text":" 获得了闪闪发光的钻石!","color":"aqua"}]
+execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=253,dz=32] run tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s"},{"text":" 获得了闪闪发光的钻石","color":"aqua"}]
 execute as @a[scores={diamond=1..},tag=!diamond_got,x=1000,y=0,z=5000,dx=32,dy=253,dz=32] as @a run function lib:sounds/hit
 tag @a remove diamond_got
 tag @a[scores={diamond=1..}] add diamond_got