LTCatt 6 лет назад
Родитель
Сommit
e7bc702331

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

@@ -18,6 +18,7 @@ gamerule fireDamage false
 gamerule doTileDrops false
 gamerule doMobLoot false
 gamerule doTraderSpawning false
+gamerule drowningDamage false
 
 # 主寄存区块:将所有需要不卸载的都放里面
 #   已占用:(0,0,0) (0,0,1)

+ 0 - 2
data/ltw/functions/main/player_leave.mcfunction

@@ -8,5 +8,3 @@ execute if score $state mem matches 1.. if score $game_type mem matches 1 if sco
 
 # 如果携带热土豆的玩家掉线,则重新生成土豆
 execute if score $state mem matches 5 if score $mini_type mem matches 3 run function mini:hotpm/player_leave
-
-# TODO : [010] 摸新的大厅

+ 13 - 14
data/mini/functions/parkour/game/test_treasure.mcfunction

@@ -1,21 +1,12 @@
-# 1009.52 14.08 1007.45 营地屋顶
-# 1021.53 15.95 1016.63 沙漠骨骸
-# 1007.72 30.50 1019.92 神庙立柱
-# 1011.66 19.16 1058.34 下界之门
-# 1026.56 18.30 1047.10 落日森林
-# 1004.50 18.50 1043.50 地狱之顶
-# 1013.08 08.30 1040.86 节奏舞厅
-# 1007.35 13.30 1025.31 末路营火
-
 tag @a remove get_treasure
 
 execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,tag=!watcher,tag=!debug,distance=..2] unless entity @a[tag=treasure1] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "营地屋顶","color":"gold"}," 的宝藏!"]
 execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,tag=!watcher,tag=!debug,distance=..2] run tag @s add get_treasure
 execute positioned 1009.50 14.50 1007.50 as @a[tag=!treasure1,tag=!watcher,tag=!debug,distance=..2] run tag @s add treasure1
 
-execute positioned 1021.50 15.50 1016.50 as @a[tag=!treasure2,tag=!watcher,tag=!debug,distance=..2] unless entity @a[tag=treasure2] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠骨骸","color":"gold"}," 的宝藏!"]
-execute positioned 1021.50 15.50 1016.50 as @a[tag=!treasure2,tag=!watcher,tag=!debug,distance=..2] run tag @s add get_treasure
-execute positioned 1021.50 15.50 1016.50 as @a[tag=!treasure2,tag=!watcher,tag=!debug,distance=..2] run tag @s add treasure2
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,tag=!watcher,tag=!debug,distance=..2] unless entity @a[tag=treasure2] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠骨骸","color":"gold"}," 的宝藏!"]
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,tag=!watcher,tag=!debug,distance=..2] run tag @s add get_treasure
+execute positioned 1020.50 15.50 1016.50 as @a[tag=!treasure2,tag=!watcher,tag=!debug,distance=..2] run tag @s add treasure2
 
 execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,tag=!watcher,tag=!debug,distance=..2] unless entity @a[tag=treasure3] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "神庙立柱","color":"gold"}," 的宝藏!"]
 execute positioned 1008.50 30.50 1020.50 as @a[tag=!treasure3,tag=!watcher,tag=!debug,distance=..2] run tag @s add get_treasure
@@ -41,7 +32,15 @@ execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,tag=!watcher,tag=!
 execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,tag=!watcher,tag=!debug,distance=..2] run tag @s add get_treasure
 execute positioned 1007.50 13.50 1025.50 as @a[tag=!treasure8,tag=!watcher,tag=!debug,distance=..2] run tag @s add treasure8
 
+execute positioned 1024.50 30.50 1038.50 as @a[tag=!treasure9,tag=!watcher,tag=!debug,distance=..2] unless entity @a[tag=treasure9] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "活塞平台","color":"gold"}," 的宝藏!"]
+execute positioned 1024.50 30.50 1038.50 as @a[tag=!treasure9,tag=!watcher,tag=!debug,distance=..2] run tag @s add get_treasure
+execute positioned 1024.50 30.50 1038.50 as @a[tag=!treasure9,tag=!watcher,tag=!debug,distance=..2] run tag @s add treasure9
+
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,tag=!watcher,tag=!debug,distance=..2] unless entity @a[tag=treasure10] run tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"selector": "@s","color":"gold"} , " 第一个获得了 ",{"text": "沙漠密室","color":"gold"}," 的宝藏!"]
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,tag=!watcher,tag=!debug,distance=..2] run tag @s add get_treasure
+execute positioned 1014.50 19.50 1024.50 as @a[tag=!treasure10,tag=!watcher,tag=!debug,distance=..2] run tag @s add treasure10
+
 scoreboard players add @a[tag=get_treasure] treasure 1
-tellraw @a[tag=get_treasure,scores={treasure=..7}] ["",{"text":">> ","color":"green","bold": true},"你已获得 ",{"score": {"objective": "treasure","name": "*"},"color":"green"},{"text": " 份 ","color":"green"},"宝藏!"]
-execute as @a[tag=get_treasure,scores={treasure=8}] run function mini:parkour/player_finished
+tellraw @a[tag=get_treasure,scores={treasure=..9}] ["",{"text":">> ","color":"green","bold": true},"你已获得 ",{"score": {"objective": "treasure","name": "*"},"color":"green"},{"text": " 份 ","color":"green"},"宝藏!"]
+execute as @a[tag=get_treasure,scores={treasure=10}] run function mini:parkour/player_finished
 execute as @a[tag=get_treasure] at @s run function lib:sounds/levelup

+ 4 - 2
data/mini/functions/parkour/game_init.mcfunction

@@ -25,7 +25,7 @@ kill @e[type=trident]
 function mini:parkour/game/marker_spawn
 
 # 生成奖励物品
-execute positioned 1024.5 30.5 1038.5 run function item:bonus_item/gameparty/auto/green
+# execute positioned 1024.5 30.5 1038.5 run function item:bonus_item/gameparty/auto/green
 
 # 生成传送门实体
 summon minecraft:falling_block 1014 21 1057 {Time:1,NoGravity:1b,BlockState:{Name:"nether_portal",Properties:{axis:z}},Tags:["parkour_block"]}
@@ -37,13 +37,15 @@ summon minecraft:falling_block 1014 23 1056 {Time:1,NoGravity:1b,BlockState:{Nam
 
 # 生成宝藏实体
 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 1021.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 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 30.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
 

+ 2 - 2
data/mini/functions/parkour/game_start.mcfunction

@@ -1,12 +1,12 @@
 # 游戏结束倒计时
-scoreboard players set $countdown mem 140
+scoreboard players set $countdown mem 150
 
 # HUD
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay list total_score_disp
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay belowName total_score_disp
 execute if score $mini_type mem matches 1 run scoreboard objectives setdisplay sidebar treasure
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 140
+scoreboard players set $countdown_max mem 150
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:blue name "剩余时间"

+ 1 - 1
data/mini/functions/parkour/init.mcfunction

@@ -1,3 +1,3 @@
 # 重置计分板
 scoreboard objectives remove treasure
-scoreboard objectives add treasure dummy "已获得宝藏"
+scoreboard objectives add treasure dummy "获得宝藏数"

+ 2 - 0
data/mini/functions/parkour/player_enter.mcfunction

@@ -23,6 +23,8 @@ tag @s remove treasure5
 tag @s remove treasure6
 tag @s remove treasure7
 tag @s remove treasure8
+tag @s remove treasure9
+tag @s remove treasure10
 
 # 传送玩家
 tp @s[tag=!watcher,tag=!rejoining,tag=!debug] 1010.07 7.50 1006.98 -1518.69 -10.62

+ 1 - 2
data/mini/functions/parkour/player_intro.mcfunction

@@ -1,7 +1,6 @@
 # 向单个玩家展示小游戏介绍
 tp @s[tag=!debug] 1010.96 26.83 1032.37 -385.24 16.67
-tellraw @s ["",{"text":"\n >> 遗迹寻宝 >>\n\n","color":"gold","bold":true}," 遗迹中共有 8 处宝藏, 赶在遗迹关闭前尽量收集吧!\n"]
+tellraw @s ["",{"text":"\n >> 遗迹寻宝 >>\n\n","color":"gold","bold":true}," 遗迹中共有十处宝藏, 赶在遗迹关闭前尽量收集吧!\n"]
 tellraw @s ["",{"text": " <积分制> ","color":"red","bold": true}, {"text":"根据寻得的宝藏数量进行排名。","color":"gray"}]
 tellraw @s ["",{"text": " <和平环境> ","color":"light_purple","bold": true}, {"text":"无法攻击其他玩家。","color":"gray"}]
-tellraw @s ["",{"text": " <额外道具> ","color":"aqua","bold": true}, {"text":"小游戏地图中存在 1 个绿色道具。","color":"gray"}]
 tellraw @s ""