龙腾猫跃 před 3 roky
rodič
revize
2b8bbbb2fd

+ 4 - 4
data/item/functions/shop/buy/042_float.mcfunction

@@ -1,14 +1,14 @@
-# 浮空药水 II (4g)
+# 浮空药水 II (8g)
 scoreboard players add @s shop_04_float 0
 scoreboard players add @s shop_04_float 0
 tag @s remove canbuy
 tag @s remove canbuy
-tag @s[scores={shop_04_float=1,gold=36..}] add canbuy
+tag @s[scores={shop_04_float=1,gold=72..}] add canbuy
 tellraw @s[scores={shop_04_float=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
 tellraw @s[scores={shop_04_float=2..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
-tellraw @s[scores={shop_04_float=1,gold=..35}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
+tellraw @s[scores={shop_04_float=1,gold=..71}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_04_float=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
 tellraw @s[scores={shop_04_float=..0}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
 tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"浮空药水延时","color":"green"}]
 tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"浮空药水延时","color":"green"}]
 execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"浮空药水延时","color":"green"}]
 execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"浮空药水延时","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_04_float 1
 scoreboard players add @s[tag=canbuy] shop_04_float 1
-scoreboard players remove @s[tag=canbuy] gold 36
+scoreboard players remove @s[tag=canbuy] gold 72
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 execute as @s[tag=canbuy] run function item:shop/refresh_gold
 execute as @s[tag=canbuy] run function item:shop/refresh_gold

+ 1 - 1
data/lib/functions/tempo_block/debug_sound.mcfunction

@@ -1,3 +1,3 @@
 # 跑酷Tempo音效
 # 跑酷Tempo音效
 function mini:parkour/game/tempo_sound
 function mini:parkour/game/tempo_sound
-function ltw:state/0/parkour/tempo_block/tempo_sound
+function ltw:state/0/parkour/tempo_sound

+ 1 - 1
data/lib/functions/tempo_block/tempo_blue.mcfunction

@@ -1,5 +1,5 @@
 # 调用其他模块
 # 调用其他模块
-execute if score $state mem matches 0 run function ltw:state/0/parkour/tempo_block/tempo_blue
+execute if score $state mem matches 0 run function ltw:state/0/parkour/tempo_blue
 execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_blue
 execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_blue
 
 
 # Debug调用
 # Debug调用

+ 1 - 1
data/lib/functions/tempo_block/tempo_blue_debug.mcfunction

@@ -1,2 +1,2 @@
-function ltw:state/0/parkour/tempo_block/tempo_blue
+function ltw:state/0/parkour/tempo_blue
 function mini:parkour/game/tempo_blue
 function mini:parkour/game/tempo_blue

+ 1 - 1
data/lib/functions/tempo_block/tempo_red.mcfunction

@@ -1,5 +1,5 @@
 # 调用其他模块
 # 调用其他模块
-execute if score $state mem matches 0 run function ltw:state/0/parkour/tempo_block/tempo_red
+execute if score $state mem matches 0 run function ltw:state/0/parkour/tempo_red
 execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_red
 execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_red
 
 
 # Debug调用
 # Debug调用

+ 1 - 1
data/lib/functions/tempo_block/tempo_red_debug.mcfunction

@@ -1,2 +1,2 @@
-function ltw:state/0/parkour/tempo_block/tempo_red
+function ltw:state/0/parkour/tempo_red
 function mini:parkour/game/tempo_red
 function mini:parkour/game/tempo_red

+ 1 - 1
data/lib/functions/tempo_block/tempo_sound.mcfunction

@@ -1,5 +1,5 @@
 # 调用其他模块(播放声音)
 # 调用其他模块(播放声音)
-execute if score $state mem matches 0 run function ltw:state/0/parkour/tempo_block/tempo_sound
+execute if score $state mem matches 0 run function ltw:state/0/parkour/tempo_sound
 execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_sound
 execute if score $state mem matches 5 if score $mini_type mem matches 1 run function mini:parkour/game/tempo_sound
 
 
 # Debug调用
 # Debug调用

+ 5 - 0
data/ltw/functions/init.mcfunction

@@ -26,6 +26,7 @@ gamerule announceAdvancements true
 #   已占用:(0,0,0) (0,0,1) (0,1,0) (0,1,1)
 #   已占用:(0,0,0) (0,0,1) (0,1,0) (0,1,1)
 forceload add 0 0
 forceload add 0 0
 forceload add 0 1900 50 2000
 forceload add 0 1900 50 2000
+forceload add -32 -17 45 -80
 setblock 0 0 0 jukebox
 setblock 0 0 0 jukebox
 setblock 0 0 1 shulker_box
 setblock 0 0 1 shulker_box
 setblock 0 1 0 minecraft:acacia_wall_sign[facing=north]
 setblock 0 1 0 minecraft:acacia_wall_sign[facing=north]
@@ -125,6 +126,10 @@ team remove gold
 team add gold "金色"
 team add gold "金色"
 team modify gold color gold
 team modify gold color gold
 team modify gold friendlyFire false
 team modify gold friendlyFire false
+team add green_test "绿色(显示测试用)"
+team modify green_test color green
+team add orange_test "橙色(显示测试用)"
+team modify orange_test color gold
 
 
 # 世界边界
 # 世界边界
 worldborder warning distance 0
 worldborder warning distance 0

+ 1 - 0
data/ltw/functions/main/game_end.mcfunction

@@ -84,3 +84,4 @@ execute as @a at @s run function lib:sounds/theend
 forceload remove all
 forceload remove all
 forceload add 0 0
 forceload add 0 0
 forceload add 0 1900 50 2000
 forceload add 0 1900 50 2000
+forceload add -32 -17 45 -80

+ 0 - 0
data/ltw/functions/state/0/parkour/tempo_block/marker_spawn.mcfunction → data/ltw/functions/state/0/parkour/marker_spawn.mcfunction


+ 0 - 0
data/ltw/functions/state/0/parkour/tempo_block/tempo_blue.mcfunction → data/ltw/functions/state/0/parkour/tempo_blue.mcfunction


+ 0 - 0
data/ltw/functions/state/0/parkour/tempo_block/tempo_red.mcfunction → data/ltw/functions/state/0/parkour/tempo_red.mcfunction


+ 0 - 0
data/ltw/functions/state/0/parkour/tempo_block/tempo_sound.mcfunction → data/ltw/functions/state/0/parkour/tempo_sound.mcfunction


+ 8 - 16
data/ltw/functions/state/0/state_enter.mcfunction

@@ -1,6 +1,8 @@
-# 加载地图
-forceload add -32 -17 31 -80
-kill @e[type=item]
+# 清理加载区域
+forceload remove all
+forceload add 0 0
+forceload add 0 1900 50 2000
+forceload add -32 -17 45 -80
 
 
 # 世界边界
 # 世界边界
 worldborder set 1000000
 worldborder set 1000000
@@ -27,17 +29,7 @@ gamerule doTileDrops false
 # 修改队伍颜色
 # 修改队伍颜色
 team modify playing color green
 team modify playing color green
 
 
-# 加载老板
-function ltw:state/0/summon_entity
-
-# 清理加载区域
-forceload remove all
-forceload add 0 0
-forceload add 0 1900 50 2000
-
-# 启用节奏跑酷
-scoreboard players set $tempo_enable mem 1
-function ltw:state/0/parkour/tempo_block/marker_spawn
-
 # 重置开始倒计时
 # 重置开始倒计时
-scoreboard players set #start_countdown mem 9999999
+scoreboard players set #start_countdown mem 9999999
+
+schedule function ltw:state/0/state_enter_2 10t replace

+ 8 - 0
data/ltw/functions/state/0/state_enter_2.mcfunction

@@ -0,0 +1,8 @@
+
+# 重置实体
+kill @e[type=item]
+function ltw:state/0/summon_entity
+
+# 启用节奏跑酷
+scoreboard players set $tempo_enable mem 1
+function ltw:state/0/parkour/marker_spawn

+ 5 - 0
data/ltw/functions/state/0/summon_entity.mcfunction

@@ -22,3 +22,8 @@ execute unless entity @e[type=armor_stand,tag=shop_particle_8,tag=lobby_entity]
 execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run kill @e[type=minecart,tag=lobby_entity]
 execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run kill @e[type=minecart,tag=lobby_entity]
 execute unless entity @e[type=minecart,tag=lobby_entity] run kill @e[type=piglin,tag=lobby_entity,tag=shop_piglin_11]
 execute unless entity @e[type=minecart,tag=lobby_entity] run kill @e[type=piglin,tag=lobby_entity,tag=shop_piglin_11]
 execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run summon minecart 4 28 -47 {Rotation:[0.0f,0.0f],Tags:["lobby_entity"],Passengers:[{id:"minecraft:piglin",Rotation:[90.0f,0.0f],Tags:["lobby_entity","shop_piglin_11"],CustomName:'{"text":"神秘老板"}',ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"gold_block",Count:1b},{}],HandDropChances:[0.0f,0.0f]}]}
 execute unless entity @e[type=piglin,tag=shop_piglin_11,tag=lobby_entity] run summon minecart 4 28 -47 {Rotation:[0.0f,0.0f],Tags:["lobby_entity"],Passengers:[{id:"minecraft:piglin",Rotation:[90.0f,0.0f],Tags:["lobby_entity","shop_piglin_11"],CustomName:'{"text":"神秘老板"}',ArmorDropChances:[0.0f,0.0f,0.0f,0.0f],PersistenceRequired:1b,IsImmuneToZombification:1b,CannotHunt:1b,HandItems:[{id:"gold_block",Count:1b},{}],HandDropChances:[0.0f,0.0f]}]}
+
+# 召唤显示测试实体
+execute unless entity @e[tag=visual_1,tag=lobby_entity] run summon armor_stand 0 300.25 -49.75 {Tags:["lobby_entity","visual_1"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"snowball",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Team:"orange_test",Glowing:1b}
+execute unless entity @e[tag=visual_2,tag=lobby_entity] run summon item 44.0 300.9 -48.50 {Tags:["lobby_entity","visual_2"],Age:-32768,PickupDelay:32767,NoGravity:1,Invulnerable:1,Glowing:1,Motion:[0,0,0],Item:{id:"minecraft:stone",Count:1}}
+team join green_test @e[tag=visual_2]

+ 10 - 12
data/mini/functions/parkour/game_init2.mcfunction

@@ -20,15 +20,13 @@ summon minecraft:falling_block 1014 23 1057 {Time:1,NoGravity:1b,BlockState:{Nam
 summon minecraft:falling_block 1014 23 1056 {Time:1,NoGravity:1b,BlockState:{Name:"nether_portal",Properties:{axis:z}},Tags:["parkour_block"]}
 summon minecraft:falling_block 1014 23 1056 {Time:1,NoGravity:1b,BlockState:{Name:"nether_portal",Properties:{axis:z}},Tags:["parkour_block"]}
 
 
 # 生成宝藏实体
 # 生成宝藏实体
-summon armor_stand 1009.50 14.50 1007.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1020.50 15.50 1016.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1008.50 30.50 1020.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1011.50 19.50 1058.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1026.50 18.50 1047.00 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1004.50 18.50 1043.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1013.00 08.50 1041.00 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1007.50 13.50 1025.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1024.50 29.50 1038.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-summon armor_stand 1014.50 19.50 1024.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b}
-team join gold @e[tag=treasure_item]
-effect give @e[tag=treasure_item] glowing 1000000 0 true
+summon armor_stand 1009.50 14.50 1007.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1020.50 15.50 1016.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1008.50 30.50 1020.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1011.50 19.50 1058.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1026.50 18.50 1047.00 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1004.50 18.50 1043.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1013.00 08.50 1041.00 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1007.50 13.50 1025.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1024.50 29.50 1038.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}
+summon armor_stand 1014.50 19.50 1024.50 {Tags:["treasure_item"],DisabledSlots:7967,ArmorItems:[{},{},{},{id:"chest",Count:1}],Invisible:1b,Small:1b,NoGravity:1b,Marker:1b,Glowing:1b,Team:"gold"}