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

data/item/functions/special/enchanted_apple.mcfunction

@@ -8,7 +8,7 @@ execute if score $state mem matches 5 if score @s mini_heart matches 1.. run tel
 
 # 归还苹果
 execute if score $state mem matches 5 unless score @s mini_heart matches 1.. run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text":"你只能在存在生命计数的小游戏中食用生命果!","color":"aqua"}]
-execute if score $state mem matches 5 unless score @s mini_heart matches 1.. run give @s enchanted_golden_apple
+execute if score $state mem matches 5 unless score @s mini_heart matches 1.. run give @s minecraft:enchanted_golden_apple{display:{Name:'{"text":"附魔生命果","italic":0}',Lore:['{"text":"小游戏中生命值加倍","italic":0,"color":"gray"}']},bonus_new:0b,bonus_return:1b,is_bonus:1b,item_name:'{"text":"附魔生命果","color":"aqua"}'}
 
 # 检测小游戏是否去除特殊效果
 execute if score $state mem matches 5 if score $mini_type mem matches 5 run scoreboard players set $t_remove_resistance mem 1 

data/item/functions/special/golden_apple.mcfunction

@@ -8,7 +8,7 @@ execute if score $state mem matches 5 if score @s mini_heart matches 1.. run tel
 
 # 归还苹果
 execute if score $state mem matches 5 unless score @s mini_heart matches 1.. run tellraw @s ["",{"text": ">> ","color":"aqua","bold": true},{"text":"你只能在存在生命计数的小游戏中食用生命果!","color":"aqua"}]
-execute if score $state mem matches 5 unless score @s mini_heart matches 1.. run give @s golden_apple
+execute if score $state mem matches 5 unless score @s mini_heart matches 1.. run give @s minecraft:golden_apple{display:{Name:'{"text":"生命果","italic":0}',Lore:['{"text":"小游戏中生命值 +1","italic":0,"color":"gray"}']},bonus_new:0b,bonus_return:1b,is_bonus:1b,item_name:'{"text":"生命果","color":"white"}'}
 
 # 检测小游戏是否去除特殊效果
 execute if score $state mem matches 5 if score $mini_type mem matches 5 run scoreboard players set $t_remove_resistance mem 1 

data/ltw/functions/state/6/generate_bonus.mcfunction

@@ -3,14 +3,14 @@ kill @e[type=item]
 
 execute store result score $t_bonus_count mem if entity @a[tag=!watcher]
 # scoreboard players add $t_bonus_count mem 1
-execute if score $t_bonus_count mem matches 1.. positioned 17.50 10.80 1967.50 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 2.. positioned 19.50 10.80 1962.50 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 3.. positioned 24.50 10.80 1960.50 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 4.. positioned 29.50 10.80 1962.50 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 5.. positioned 31.50 10.80 1967.50 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 6.. positioned 29.50 10.80 1972.50 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 7.. positioned 24.50 10.80 1974.50 run function item:bonus_item/rank/random
-execute if score $t_bonus_count mem matches 8.. positioned 19.50 10.80 1972.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 1.. positioned 17.50 10.30 1967.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 2.. positioned 19.50 10.30 1962.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 3.. positioned 24.50 10.30 1960.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 4.. positioned 29.50 10.30 1962.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 5.. positioned 31.50 10.30 1967.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 6.. positioned 29.50 10.30 1972.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 7.. positioned 24.50 10.30 1974.50 run function item:bonus_item/rank/random
+execute if score $t_bonus_count mem matches 8.. positioned 19.50 10.30 1972.50 run function item:bonus_item/rank/random
 
 # 生成拾取窗口
 #execute as @e[type=item] at @s run fill ~-0.2 ~ ~-0.2 ~0.2 ~ ~0.2 air

data/ltw/functions/state/7/player_enter.mcfunction

@@ -6,11 +6,11 @@ title @s actionbar ""
 effect clear @s
 effect give @s saturation 1000000 0 true
 gamerule naturalRegeneration true
-effect give @s night_vision 1000000 0 true
+#effect give @s night_vision 1000000 0 true
 effect give @s resistance 1000000 4 true
 
 # 传送玩家
-tp @s 24.50 14.00 1967.50 0 90
+tp @s 24.50 14.00 1967.50 90 90
 execute at @s run function lib:sounds/travel
 
 # 清除 Tag