aqupa hace 4 años
padre
commit
14f42d0329

+ 20 - 17
data/mini/functions/rgb/game_init.mcfunction

@@ -6,22 +6,22 @@ scoreboard players set $countdown_fast mem 0
 scoreboard players set $survival mem 0
 
 # 生成地图
-setblock 1008 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_000",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1040 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_100",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1008 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_001",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1040 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_101",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1008 8 8000 minecraft:redstone_block
-setblock 1040 8 8000 minecraft:redstone_block
-setblock 1008 8 8032 minecraft:redstone_block
-setblock 1040 8 8032 minecraft:redstone_block
-setblock 1008 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_000_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1040 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_100_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1008 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_001_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1040 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_101_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32}
-setblock 1008 8 8000 minecraft:redstone_block
-setblock 1040 8 8000 minecraft:redstone_block
-setblock 1008 8 8032 minecraft:redstone_block
-setblock 1040 8 8032 minecraft:redstone_block
+setblock 1008 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_000",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1040 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_100",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1008 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_001",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1040 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:1.0f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_101",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1008 8 8000 minecraft:redstone_block destroy
+setblock 1040 8 8000 minecraft:redstone_block destroy
+setblock 1008 8 8032 minecraft:redstone_block destroy
+setblock 1040 8 8032 minecraft:redstone_block destroy
+setblock 1008 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_000_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1040 7 8000 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_100_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1008 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_001_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1040 7 8032 minecraft:structure_block[mode=load]{author:"?",ignoreEntities:1b,integrity:0.01f,metadata:"",mirror:"NONE",mode:"LOAD",name:"mini:rgb_101_p",posX:0,posY:0,posZ:0,powered:0b,rotation:"NONE",seed:0L,showair:0b,showboundingbox:0b,sizeX:32,sizeY:32,sizeZ:32} destroy
+setblock 1008 8 8000 minecraft:redstone_block destroy
+setblock 1040 8 8000 minecraft:redstone_block destroy
+setblock 1008 8 8032 minecraft:redstone_block destroy
+setblock 1040 8 8032 minecraft:redstone_block destroy
 
 # 伤害管理
 scoreboard players set $remove_resistance mem 1
@@ -33,4 +33,7 @@ gamerule fallDamage true
 
 # 重置系统
 data remove storage ltw:mini rgb
-scoreboard players set $ rgb_rule_id 0
+scoreboard players set $ rgb_rule_id 0
+scoreboard players reset @a rgb_R
+scoreboard players reset @a rgb_G
+scoreboard players reset @a rgb_B

+ 3 - 3
data/mini/functions/rgb/init.mcfunction

@@ -5,11 +5,11 @@ scoreboard objectives remove rgb_rule_id
 scoreboard objectives add rgb_rule_id dummy "RGB小游戏规则ID"
 
 scoreboard objectives remove rgb_R
-scoreboard objectives add rgb_R dummy {"text": "R","color": "red"}
+scoreboard objectives add rgb_R dummy {"text": "R","color": "red","bold": true}
 scoreboard objectives remove rgb_G
-scoreboard objectives add rgb_G dummy {"text": "G","color": "green"}
+scoreboard objectives add rgb_G dummy {"text": "G","color": "green","bold": true}
 scoreboard objectives remove rgb_B
-scoreboard objectives add rgb_B dummy {"text": "B","color": "blue"}
+scoreboard objectives add rgb_B dummy {"text": "B","color": "blue","bold": true}
 
 scoreboard objectives remove rgb_obtain_rule
 scoreboard objectives add rgb_obtain_rule minecraft.mined:minecraft.pumpkin "RGB小游戏获得规则计分板"

+ 4 - 4
data/mini/functions/rgb/tick20.mcfunction

@@ -1,7 +1,7 @@
 # 切换计分板显示
 scoreboard players add $scb_switch rgb_sys 1
-execute if score $scb_switch rgb_sys matches 6.. run scoreboard players set $scb_switch rgb_sys 0
+execute if score $scb_switch rgb_sys matches 9.. run scoreboard players set $scb_switch rgb_sys 0
 
-execute if score $scb_switch rgb_sys matches 0..1 run scoreboard objectives setdisplay sidebar rgb_R
-execute if score $scb_switch rgb_sys matches 2..3 run scoreboard objectives setdisplay sidebar rgb_G
-execute if score $scb_switch rgb_sys matches 4..5 run scoreboard objectives setdisplay sidebar rgb_B
+execute if score $scb_switch rgb_sys matches 0..2 run scoreboard objectives setdisplay sidebar rgb_R
+execute if score $scb_switch rgb_sys matches 3..5 run scoreboard objectives setdisplay sidebar rgb_G
+execute if score $scb_switch rgb_sys matches 6..8 run scoreboard objectives setdisplay sidebar rgb_B