完成！

data/item/functions/bonus_item/add_score.mcfunction

@@ -18,7 +18,7 @@ execute if score #bonus_add_score mem matches ..-1 run scoreboard players set @s
 function item:refresh_level
 
 # 给予进度
-execute if entity @s[scores={total_score=8..}] run advancement grant @s only ltw:story/score1
-execute if entity @s[scores={total_score=16..}] run advancement grant @s only ltw:story/score2
-execute if entity @s[scores={total_score=24..}] run advancement grant @s only ltw:story/score3
-execute if entity @s[scores={total_score=32..}] run advancement grant @s only ltw:story/score4
+execute if entity @s[scores={total_score=10..}] run advancement grant @s only ltw:story/score1
+execute if entity @s[scores={total_score=20..}] run advancement grant @s only ltw:story/score2
+execute if entity @s[scores={total_score=30..}] run advancement grant @s only ltw:story/score3
+execute if entity @s[scores={total_score=40..}] run advancement grant @s only ltw:story/score4

data/item/loot_tables/item/blue.json

@@ -33,7 +33,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"钓鱼竿\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,display:{Name:'{\"text\":\"钓鱼竿\",\"italic\":false,\"color\":\"light_purple\"}'}}"
+                "tag": "{item_name:'{\"text\":\"<饵钓 I> 钓鱼竿\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,Enchantments:[{id:\"lure\",lvl:1}],display:{Name:'{\"text\":\"<饵钓 I> 钓鱼竿\",\"italic\":false,\"color\":\"light_purple\"}'}}"
             }
         ]
     },
@@ -114,7 +114,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{display:{Name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"italic\":false,\"color\":\"light_purple\"}'},item_name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;23,38,0,2],Amount:8,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"legs\",Operation:0},{UUID:[I;23,38,0,3],Amount:8,AttributeName:\"generic.armor_toughness\",Name:\"armor1\",Slot:\"legs\",Operation:0},{UUID:[I;23,38,0,1],Amount:100,AttributeName:\"generic.knockback_resistance\",Name:\"kn\",Slot:\"legs\",Operation:0}]}"
+                "tag": "{display:{Name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"italic\":false,\"color\":\"light_purple\"}'},item_name:'{\"text\":\"<免疫击退> 下界合金胸甲\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,bonus_return:1b,AttributeModifiers:[{UUID:[I;23,38,0,2],Amount:8,AttributeName:\"generic.armor\",Name:\"armor\",Slot:\"chest\",Operation:0},{UUID:[I;23,38,0,3],Amount:8,AttributeName:\"generic.armor_toughness\",Name:\"armor1\",Slot:\"chest\",Operation:0},{UUID:[I;23,38,0,1],Amount:100,AttributeName:\"generic.knockback_resistance\",Name:\"kn\",Slot:\"chest\",Operation:0}]}"
             }
         ]
     }

data/item/loot_tables/item/white.json

@@ -70,7 +70,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{CustomPotionColor:12754293,item_name:'{\"text\":\"滞留型神龟药水 (0:05) x3\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}}]}"
+                "tag": "{CustomPotionColor:12754293,item_name:'{\"text\":\"滞留型神龟药水 (0:05) x3\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_give_items:[{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}},{id:\"minecraft:lingering_potion\",Count:1,tag:{bonus_return:1b,is_bonus:1b,CustomPotionEffects:[{Id:2,Amplifier:5,Duration:100},{Id:11,Amplifier:3,Duration:100}],CustomPotionColor:12754293,display:{Name:'{\"text\":\"滞留型神龟药水 (0:05)\",\"italic\":false,\"color\":\"white\"}'}}}]}"
             }
         ]
     },

data/item/loot_tables/mixed/blue.json

@@ -7,11 +7,11 @@
         "functions": [
             {
                 "function": "minecraft:set_count",
-                "count": 5
+                "count": 7
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取 5 积分\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_add_score:5}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取 7 积分\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_add_score:7}"
             }
         ]
     },
@@ -27,7 +27,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机橙色道具\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"purple\",Count:1}]}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机紫色道具 x2\",\"color\":\"light_purple\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"blue\",Count:2}]}"
             }
         ]
     },

data/item/loot_tables/mixed/green.json

@@ -12,11 +12,11 @@
         "functions": [
             {
                 "function": "minecraft:set_count",
-                "count": 4
+                "count": 5
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取 4 积分\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_add_score:4}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取 5 积分\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_add_score:5}"
             }
         ]
     },
@@ -32,7 +32,7 @@
         "functions": [
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机紫色道具\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"blue\",Count:1}]}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机蓝色道具 x3\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"blue\",Count:3}]}"
             }
         ]
     },

data/item/loot_tables/mixed/purple.json

@@ -27,7 +27,7 @@
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机紫色道具 x3\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"blue\",Count:3}]}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机紫色道具 x4\",\"color\":\"gold\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"blue\",Count:4}]}"
             }
         ]
     },

data/item/loot_tables/mixed/white.json

@@ -2,43 +2,62 @@
 
     {
         "type": "minecraft:loot_table",
-        "weight": 30,
+        "weight": 28,
         "name": "item:score/white"
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 6,
         "name": "minecraft:blaze_powder",
         "functions": [
             {
                 "function": "minecraft:set_count",
-                "count": 2
+                "count": 3
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取 2 积分\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_add_score:2}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取 3 积分\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_add_score:3}"
             }
         ]
     },
     {
         "type": "minecraft:loot_table",
-        "weight": 50,
+        "weight": 48,
         "name": "item:item/white"
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 3,
         "name": "minecraft:blaze_powder",
         "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 5
+            },
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机白色道具 x5\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"white\",Count:5}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 3,
+        "name": "minecraft:blaze_powder",
+        "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 2
+            },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机蓝色道具\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"green\",Count:1}]}"
+                "tag": "{item_name:'{\"text\":\"清空物品栏, 换取随机蓝色道具 x2\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,clean_inventory:1b,bonus_random_bonus:[{type:\"item\",level:\"green\",Count:2}]}"
             }
         ]
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 6,
         "name": "minecraft:shulker_shell",
         "functions": [
             {
@@ -49,7 +68,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 5,
+        "weight": 6,
         "name": "minecraft:shulker_shell",
         "functions": [
             {

data/item/loot_tables/score/green.json

@@ -163,7 +163,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +7 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +8 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
         }
     ]
 },
@@ -174,7 +174,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +7 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:7}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +8 或清零\",\"color\":\"aqua\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:8}"
         }
     ]
 }

data/item/loot_tables/score/white.json

@@ -66,7 +66,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +4 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +5 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:-1}"
         }
     ]
 },
@@ -77,7 +77,7 @@
     "functions": [
         {
             "function": "minecraft:set_nbt",
-            "tag": "{item_name:'{\"text\":\"积分随机 +4 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:4}"
+            "tag": "{item_name:'{\"text\":\"积分随机 +5 或清零\",\"color\":\"white\"}',is_bonus:1b,bonus_new:1b,bonus_add_score:5}"
         }
     ]
 }

data/ltw/advancements/story/score1.json

@@ -8,7 +8,7 @@
         "text": "积分猎手 · α "
       },
       "description": [
-        {"text": "在单局游戏中达到 8 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 10 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score2.json

@@ -8,7 +8,7 @@
         "text": "积分猎手 · β "
       },
       "description": [
-        {"text": "在单局游戏中达到 16 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 20 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score3.json

@@ -8,7 +8,7 @@
         "text": "积分猎手 · γ "
       },
       "description": [
-        {"text": "在单局游戏中达到 24 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 30 积分\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/story/score4.json

@@ -8,7 +8,7 @@
         "text": "积分猎手 · Ω "
       },
       "description": [
-        {"text": "在单局游戏中达到 32 积分\n", "color":"gray"},
+        {"text": "在单局游戏中达到 40 积分\n", "color":"gray"},
         {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
       ],
       "frame": "challenge",

data/minecraft/loot_tables/gameplay/fishing.json

@@ -3,37 +3,24 @@
   "pools": [
     {
       "rolls": 1.0,
-      "bonus_rolls": 0.0,
       "entries": [
+        
         {
           "type": "minecraft:loot_table",
-          "weight": 10,
-          "quality": -2,
-          "name": "minecraft:gameplay/fishing/junk"
+          "weight": 1,
+          "name": "item:item/white"
         },
         {
           "type": "minecraft:loot_table",
-          "conditions": [
-            {
-              "condition": "minecraft:entity_properties",
-              "predicate": {
-                "fishing_hook": {
-                  "in_open_water": true
-                }
-              },
-              "entity": "this"
-            }
-          ],
-          "weight": 5,
-          "quality": 2,
-          "name": "minecraft:gameplay/fishing/treasure"
+          "weight": 1,
+          "name": "item:item/green"
         },
         {
           "type": "minecraft:loot_table",
-          "weight": 85,
-          "quality": -1,
-          "name": "minecraft:gameplay/fishing/fish"
+          "weight": 1,
+          "name": "item:item/blue"
         }
+
       ]
     }
   ]