diff --git a/README.md b/README.md
index d2c2ad7..5ddb1e2 100644
--- a/README.md
+++ b/README.md
@@ -4,59 +4,71 @@ A Minecraft Datapack
 
 #### This project is licensed under the terms of the GNU General Public License v3.0.
 #### Copyright (C)2019-2021 Harvey_Husky
-### 总览
-- v2.1.x支持Minecraft1.17+
-- v2.0.x支持Minecraft1.16.3-1.16.5
+[B站链接](https://www.bilibili.com/read/cv4267319)
+## 总览
+![设置界面](./图片示例：设置界面.png)
 - 抬头并按一下shift来打开设置界面
 - 提供玩家挖掘、死亡、击杀、受伤、交易、钓鱼、滑翔、（破基岩）数据的榜单
-	- 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
-		- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
-    - 记分板对照表：
-        - activation - 活跃时间(h)
-        - damageTaken - 受伤害榜
-        - deathCounter - 死亡榜
-        - digCounter - 挖掘榜
-        - fishingCounter - 钓鱼榜
-        - killCounter - 击杀榜
-        - tradingCounter - 交易榜
-        - totalList - 总 量
-        - bedrockBreaked - 铁头功
-        - fz.aviate1m - 滑翔距离
-- 提供一些地毯脚本：*请在升级数据包的同时替换这些工具！！*
+- 提供扫地机
+- 配套的无需配置即可支持该铁头功破基岩榜Mod：[FZ-BBL](https://gitee.com/harvey-husky/FZ-BBL/releases)
+	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
+- 记分板对照表：
+    | Object Name | 内容 |
+	| ----------- | ---- |
+	| activation | 活跃时间(h) |
+    | damageTaken | 受伤害榜 |
+    | deathCounter | 死亡榜 |
+    | digCounter | 挖掘榜 |
+    | fishingCounter | 钓鱼榜 |
+    | killCounter | 击杀榜 |
+    | tradingCounter | 交易榜 |
+    | totalList | 总 量 |
+    | bedrockBreaked | [铁头功破基岩](https://www.bilibili.com/video/BV1KJ411b73z) |
+    | fz.aviate1m | 滑翔距离 |
+- 提供一些地毯脚本（.sc文件）：***请在升级数据包的同时替换这些工具！！***
 	- 安装方法：
-		- 需要carpet mod 1.4.24+：https://github.com/gnembon/fabric-carpet/releases
-		- 将其放入“world/scripts”中(在客户端位于“.minecraft/saves/存档名/scripts”或“.minecraft/config/carpet/scripts”)
-	- here.sc：
-		- “/here”向所有人发送自己的位置和所在维度
-			- 发送的消息使用voxelmap可识别的数组格式
-			- 安装voxelmap mod后，左键高亮该坐标，ctrl+左键新建坐标点
-	- c.sc
-		- “/c”修改玩家模式为旁观模式
-	- s.sc
-		- “/s”修改玩家模式为生存模式
-	- tagplayer.sc：
-		- 这个工具可以防止将地毯mod生成的假人计入记分板
-		- 可以通过自定义文件名来自定义游戏内命令
-        - 配置文件：
-            - “allow_bot_tp”：用于控制是否允许tp假人
-            - “allow_spawning_whitelist_players”：用于控制是否允许生成白名单内的玩家
-		- 使用方法：
-			- 输入“/script load tagplayer”加载工具
-			- 包含全部地毯假人自带的功能，以及新功能，如：
-				- “/tagplayer check xxx”：检查玩家的状态
-				- “/tagplayer checkall”：检查所有玩家的状态
-				- “/tagplayer killall”：清除所有假人
-				- 其他用法可以在游戏内输入“/tagplayer”查看
-	- restore_scores.sc：
-		- 从数据包1.4升级时也需要使用这个工具
-		- 这个工具可以从白名单读取玩家列表，逐一召唤假人，读取统计信息并赋值给记分板
-			- 悄悄说一句没白名单的服把usercache.json复制一份改成whitelist.json就可以啦
-		- *注意：原有的记分板会被删除*
-		- 使用方法：
-			- 输入“/script load restore_scores”加载工具
-			- 输入“/restore_scores by_whitelist”开始恢复
-			- 输入“/script unload restore_scores”卸载工具
-			- 记得用完就删掉它！
+		- 需要[carpet mod](https://github.com/gnembon/fabric-carpet/releases) 1.4.24+
+		- 将其放入`world/scripts`中（在客户端位于`.minecraft/saves/存档名/scripts`或`.minecraft/config/carpet/scripts`）
+### `here.sc`：
+- `/here`向所有人发送自己的位置和所在维度
+	- 发送的消息使用voxelmap可识别的数组格式
+	- 安装[voxelmap mod](https://www.curseforge.com/minecraft/mc-mods/voxelmap/files)后，左键高亮该坐标，ctrl+左键新建坐标点
+### `c.sc`
+- `/c`修改玩家模式为旁观模式
+### `s.sc`
+- `/s`修改玩家模式为生存模式
+### `tagplayer.sc`：
+- [B站链接](https://www.bilibili.com/read/cv9178207)
+- 这个工具可以防止将地毯mod生成的假人计入记分板
+- 可以通过自定义文件名来自定义游戏内命令
+- 配置文件：
+    - `allow_bot_tp`：用于控制是否允许tp假人
+    - `allow_spawning_whitelist_players`：用于控制是否允许生成白名单内的玩家
+- 使用方法：
+    - 安装[carpet mod](https://github.com/gnembon/fabric-carpet/releases)
+	- 输入`/script load tagplayer`加载工具
+	- 包含全部地毯假人自带的功能，如：
+	    - `/tagplayer use xxx once`让假人xxx按一次使用键
+	- 包含新功能，如：
+		- `/tagplayer check xxx`：检查玩家的状态
+		- `/tagplayer checkall`：检查所有玩家的状态
+		- `/tagplayer killall`：清除所有假人
+	- 其他用法可以在游戏内输入`/tagplayer`查看
+
+### `restore_scores.sc`：
+- 从数据包1.4升级时也需要使用这个工具
+- 这个工具可以从白名单读取玩家列表，逐一召唤假人，读取统计信息并赋值给记分板
+	- 悄悄说一句没白名单的服把usercache.json复制一份改成whitelist.json就可以啦
+- *注意：原有的记分板会被删除*
+- 使用方法：
+	- 输入`/script load restore_scores`加载工具
+	- 输入`/restore_scores by_whitelist`开始恢复
+	- 输入`/script unload restore_scores`卸载工具
+	- 记得用完就删掉它！
+
+### 更新日志
+##### v2.1.x支持Minecraft1.17+
+##### v2.0.x支持Minecraft1.16.3-1.16.5
 ##### v2.1.2/2.0.10
 - 添加鞘翅滑翔距离榜单
 ##### v2.1.0
@@ -91,7 +103,7 @@ A Minecraft Datapack
 - 无需配置即可支持该铁头功破基岩榜Mod：https://gitee.com/harvey-husky/FZ-BBL/releases
 	- 破基岩榜的分数和订阅设置会在铁头功记分板的总分大于0时显示，以免未添加该mod的服务器显示破基岩榜
 ##### v2.0.0.11
-- “/tagplayer spawn xxx”后面现在可以追加“at”、“facing”、“in”参数
+- `/tagplayer spawn xxx`后面现在可以追加`at`、`facing`、`in`参数
 ##### v2.0.0.10
 - 扫地机添加了位于怪物血条栏的文字提示，同时添加了各种提示的开关功能
 ##### v2.0.0.9
@@ -102,7 +114,7 @@ A Minecraft Datapack
 - tagplayer添加了新版carpet新指令，可以为假人切换热键栏
 - 现在tagplayer需要carpet1.4.21或以上版本运行！
 - 现在tagplayer可以给自己设置动作了
-- 添加“/tagplayer shadow”指令将自己变为前缀为“挂机”的假人
+- 添加`/tagplayer shadow`指令将自己变为前缀为`挂机`的假人
 ##### v2.0.0.6
 - 修复restore_scores.sc工具不能恢复受伤害榜(抖M榜)的bug
 ##### v2.0.0.5
diff --git a/data/fz/advancements/scoreboards/killcounter.json b/data/fz/advancements/scoreboards/killcounter.json
index 7bf3eeb..813a1bb 100644
--- a/data/fz/advancements/scoreboards/killcounter.json
+++ b/data/fz/advancements/scoreboards/killcounter.json
@@ -10,10 +10,7 @@
                             "condition": "minecraft:entity_scores",
                             "entity": "this",
                             "scores": {
-                                "carpetBot": {
-                                    "max": 1,
-                                    "min": 1
-                                }
+                                "carpetBot": 1
                             }
                         }
                     }
diff --git a/data/fz/advancements/scoreboards/tradingcounter.json b/data/fz/advancements/scoreboards/tradingcounter.json
index e362658..c38c72d 100644
--- a/data/fz/advancements/scoreboards/tradingcounter.json
+++ b/data/fz/advancements/scoreboards/tradingcounter.json
@@ -10,10 +10,7 @@
                             "condition": "minecraft:entity_scores",
                             "entity": "this",
                             "scores": {
-                                "carpetBot": {
-                                    "max": 1,
-                                    "min": 1
-                                }
+                                "carpetBot": 1
                             }
                         }
                     }
diff --git a/data/fz/functions/config/display.mcfunction b/data/fz/functions/config/display.mcfunction
index a9f5b5c..2705174 100644
--- a/data/fz/functions/config/display.mcfunction
+++ b/data/fz/functions/config/display.mcfunction
@@ -2,27 +2,27 @@
 schedule function fz:config/timeout 300s
 #输出玩家可见的设置页面
 ##扫地机
-execute if data storage fz.installed {sweeper: 1b} run tellraw @s {"text": "扫地机：","color": "#ccff00"}
+execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s {"text": "扫地机：","color": "#ccff00"}
     ##扫地机时间，对应分数1478966210-1478966215
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s [{"text": "- "},{"text": "[关]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966210"}},{"text": "[30秒]","color": "#5fff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966211"}},{"text": "[1分钟]","color": "#d7ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966212"}},{"text": "[2分钟]","color": "#ffd900","clickEvent": {"action": "run_command","value": "/trigger config set 1478966213"}},{"text": "[3分钟]","color": "#ff6100","clickEvent": {"action": "run_command","value": "/trigger config set 1478966214"}},{"text": "[4分钟]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966215"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s [{"text": "- "},{"text": "[关]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966210"}},{"text": "[30秒]","color": "#5fff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966211"}},{"text": "[1分钟]","color": "#d7ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966212"}},{"text": "[2分钟]","color": "#ffd900","clickEvent": {"action": "run_command","value": "/trigger config set 1478966213"}},{"text": "[3分钟]","color": "#ff6100","clickEvent": {"action": "run_command","value": "/trigger config set 1478966214"}},{"text": "[4分钟]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966215"}}]
     ##开启矿车白名单1478966216
-    execute if data storage fz.installed {sweeper: 1b} unless score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966216"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} unless score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966216"}}]
     ##关闭矿车白名单1478966217
-    execute if data storage fz.installed {sweeper: 1b} if score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966217"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} if score keepMinecart parameter matches 1 run tellraw @s [{"text": "- "},{"text": "矿车白名单：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966217"}}]
     ##声音提示
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966209"}}]
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966208"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=!fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966209"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=fz.sweeperSoundOff] [{"text": "- "},{"text": "声音：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966208"}}]
     ##消息提示
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966205"}}]
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966204"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=!fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966205"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=fz.sweeperMessageOff] [{"text": "- "},{"text": "消息：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966204"}}]
     ##血条栏提示
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=!fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966207"}}]
-    execute if data storage fz.installed {sweeper: 1b} run tellraw @s[tag=fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966206"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=!fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已开启]","color": "#00ff00","clickEvent": {"action": "run_command","value": "/trigger config set 1478966207"}}]
+    execute if data storage fz:survival installed{sweeper: 1b} run tellraw @s[tag=fz.sweeperBossbarOff] [{"text": "- "},{"text": "血条栏：","color": "#8c8f91"},{"text": "[已关闭]","color": "#ff0000","clickEvent": {"action": "run_command","value": "/trigger config set 1478966206"}}]
 ##记分板
-execute if data storage fz.installed {scoreboards: 1b} run tellraw @s {"text": "记分板：","color": "#ccff00"}
+execute if data storage fz:survival installed{scoreboards: 1b} run tellraw @s {"text": "记分板：","color": "#ccff00"}
     ##计分板显示，对应分数1838019370-1838019379
-    execute if data storage fz.installed {scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
-    execute if data storage fz.installed {scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[滑翔距离]", "color": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}}]
+    execute if data storage fz:survival installed{scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
+    execute if data storage fz:survival installed{scoreboards: 1b} unless score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[滑翔距离]", "color": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}}]
     ##计分板显示，对应分数1838019369-1838019379(有破基岩榜)
-    execute if data storage fz.installed {scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
-    execute if data storage fz.installed {scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[滑翔距离]", "color": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}},{"text": "[铁头功]","color": "dark_green","hoverEvent": {"action": "show_text","contents": {"text": "破基岩榜","color": "dark_green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019369"}}]
\ No newline at end of file
+    execute if data storage fz:survival installed{scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[关]","color": "#ff0000","hoverEvent": {"action": "show_text","contents": {"text": "关", "color": "#ff0000"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019370"}},{"text": "[轮播]","color": "gold","hoverEvent": {"action": "show_text","contents": {"text": "轮播", "color": "gold"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019371"}},{"text": "[总量]","color": "dark_aqua","hoverEvent": {"action": "show_text","contents": {"text": "总量","color": "dark_aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019379"}},{"text": "[在线时间(h)]","color": "aqua","hoverEvent": {"action": "show_text","contents": {"text": "在线时间(h)","color": "aqua"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019372"}},{"text": "[抖M名单]","color": "yellow","hoverEvent": {"action": "show_text","contents": {"text": "受伤害量","color": "yellow"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019373"}},{"text": "[死亡榜]","color": "dark_red","hoverEvent": {"action": "show_text","contents": {"text": "死亡榜","color": "dark_red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019374"}},{"text": "[挖掘榜]","color": "gray","hoverEvent": {"action": "show_text","contents": {"text": "挖掘榜","color": "gray"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019375"}},{"text": "[钩直饵咸]","color": "blue","hoverEvent": {"action": "show_text","contents": {"text": "钓鱼榜","color": "blue"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019376"}},{"text": "[击杀榜]","color": "red","hoverEvent": {"action": "show_text","contents": {"text": "击杀榜","color": "red"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019377"}},{"text": "[交♂易榜]","color": "green","hoverEvent": {"action": "show_text","contents": {"text": "交易榜","color": "green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019378"}}]
+    execute if data storage fz:survival installed{scoreboards: 1b} if score 全员头铁 bedrockBreaked matches 1.. run tellraw @s [{"text": "- "},{"text": "[滑翔距离]", "color": "light_purple", "hoverEvent": {"action": "show_text","contents": {"text": "滑翔距离", "color": "light_purple"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019368"}},{"text": "[铁头功]","color": "dark_green","hoverEvent": {"action": "show_text","contents": {"text": "破基岩榜","color": "dark_green"}},"clickEvent": {"action": "run_command","value": "/trigger config set 1838019369"}}]
\ No newline at end of file
diff --git a/data/fz/functions/config/install.mcfunction b/data/fz/functions/config/install.mcfunction
index d9b5356..e44be2e 100644
--- a/data/fz/functions/config/install.mcfunction
+++ b/data/fz/functions/config/install.mcfunction
@@ -2,7 +2,7 @@
 #初始化触发器记分板
 scoreboard objectives add config trigger
 #存入已安装信息
-data merge storage fz.installed {config: 1b}
+data modify storage fz:survival installed.config set value 1b
 #提示已安装
 tellraw @a {"text": "[信息]设置功能已安装","color": "#5fff00"}
 #开始运行
diff --git a/data/fz/functions/config/uninstall.mcfunction b/data/fz/functions/config/uninstall.mcfunction
index 1bd213a..14483b4 100644
--- a/data/fz/functions/config/uninstall.mcfunction
+++ b/data/fz/functions/config/uninstall.mcfunction
@@ -4,6 +4,6 @@ schedule clear fz:config/main
 schedule clear fz:config/timeout
 data remove storage fz.config is_open
 #写入已卸载的信息
-data merge storage fz.installed {config: 0b}
+data modify storage fz:survival installed.config set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]设置功能已卸载","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/config/unsneak.mcfunction b/data/fz/functions/config/unsneak.mcfunction
index e2cb0ce..02cca45 100644
--- a/data/fz/functions/config/unsneak.mcfunction
+++ b/data/fz/functions/config/unsneak.mcfunction
@@ -1,6 +1,6 @@
 #由config/sneak和config/unsneak成就触发
 #判断玩家视角是否指向正上方，是则运行turnon函数
-execute if data storage fz.installed {config: 1b} if entity @s[x_rotation=-90] run function fz:config/turnon
+execute if data storage fz:survival installed{config: 1b} if entity @s[x_rotation=-90] run function fz:config/turnon
 #重置该玩家的两个成就
 advancement revoke @s only fz:config/sneak
 advancement revoke @s only fz:config/unsneak
\ No newline at end of file
diff --git a/data/fz/functions/health/install.mcfunction b/data/fz/functions/health/install.mcfunction
index a35a56b..0e5bcce 100644
--- a/data/fz/functions/health/install.mcfunction
+++ b/data/fz/functions/health/install.mcfunction
@@ -5,6 +5,6 @@ scoreboard objectives modify Health rendertype hearts
 scoreboard objectives setdisplay list Health
 scoreboard objectives setdisplay belowName Health
 #写入已安装的信息
-data merge storage fz.installed {health: 1b}
+data modify storage fz:survival installed.health set value 1b
 #提示已安装
 tellraw @a {"text": "[信息]血量显示已安装","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/health/uninstall.mcfunction b/data/fz/functions/health/uninstall.mcfunction
index d709f66..0f06464 100644
--- a/data/fz/functions/health/uninstall.mcfunction
+++ b/data/fz/functions/health/uninstall.mcfunction
@@ -2,6 +2,6 @@
 #删除计分板
 scoreboard objectives remove Health
 #写入已卸载的信息
-data merge storage fz.installed {health: 0b}
+data modify storage fz:survival installed.health set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]血量显示已卸载","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/install.mcfunction b/data/fz/functions/install.mcfunction
index fd6d948..b882c47 100644
--- a/data/fz/functions/install.mcfunction
+++ b/data/fz/functions/install.mcfunction
@@ -17,15 +17,13 @@ function fz:health/install
 function fz:login/logintips/install
 function fz:carpet/carpet
 #版本信息
-data merge storage fz.installed {installed: 1b}
-data merge storage fz {version: 2.1.2}
-data merge storage fz {date: 2020-7.21}
-data merge storage fz {time: "1:14"}
-##data merge storage fz {snapshot: -SNAPSHOT}
-data remove storage fz snapshot
-tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
+data modify storage fz:survival version set from storage fz:survival newVersion
+data modify storage fz:survival date set value "2020-7.21"
+data modify storage fz:survival time set value "1:14"
 #提示已安装
+data modify storage fz:survival installed.datapack set value 1b
 tellraw @a {"text": "[信息]安装完成！","color": "#5fff00"}
+tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
 #info: #5fff00 信息
 #alert: #d7ff00 提醒
 #warn: #ffd900 警告
diff --git a/data/fz/functions/load.mcfunction b/data/fz/functions/load.mcfunction
index d4cb1e2..2d78008 100644
--- a/data/fz/functions/load.mcfunction
+++ b/data/fz/functions/load.mcfunction
@@ -1,8 +1,22 @@
+#新版本号
+data modify storage fz:survival newVersion set value [2,1,3,0]
+execute if data storage fz:survival newVersion[3] run data modify storage fz:survival snapshot set value 1b
+execute unless data storage fz:survival newVersion[3] run data remove storage fz:survival snapshot
+##data remove storage fz:survival snapshot
+#版本号识别
+scoreboard objectives add fz.cache dummy
+execute store result score version1 fz.cache run data get storage fz:survival version[1]
+execute store result score version2 fz.cache run data get storage fz:survival version[2]
+execute store result score version3 fz.cache run data get storage fz:survival version[3]
+execute store result score newVersion1 fz.cache run data get storage fz:survival newVersion[1]
+execute store result score newVersion2 fz.cache run data get storage fz:survival newVersion[2]
+execute store result score newVersion3 fz.cache run data get storage fz:survival newVersion[3]
+#版本号比较
+execute if data storage fz:survival installed{datapack: 1b} unless score version1 fz.cache = newVersion1 fz.cache run function fz:start/update
+execute if data storage fz:survival installed{datapack: 1b} if score version1 fz.cache = newVersion1 fz.cache run function fz:start/00xx
+scoreboard objectives remove fz.cache
 #如果未安装且未卸载则安装
-execute unless data storage fz.installed {installed: 1b} unless data storage fz.installed {installed: 0b} run function fz:install
-#如果版本正确且已安装则开始运行
-execute if data storage fz {version: 2.1.2} if data storage fz.installed {installed: 1b} run function fz:start
-#如果版本不符则更新
-execute unless data storage fz {version: 2.1.2} run function fz:update
+execute unless data storage fz:survival installed{datapack: 1b} unless data storage fz:survival installed{datapack: 0b} run function fz:install
 #输出版本信息
-tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version","storage":"fz","color": "#ffd900"},{"nbt": "snapshot", "storage": "fz","color": "red"}]
\ No newline at end of file
+execute unless data storage fz:survival {snapshot:1b} unless data storage fz:survival installed{datapack: 0b} run tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version[0]","storage":"fz:survival","color": "#ffd900"},{"text":".","color": "#ffd900"},{"nbt":"version[1]","storage":"fz:survival","color": "#ffd900"},{"text": ".","color": "#ffd900"},{"nbt":"version[2]","storage":"fz:survival","color": "#ffd900"}]
+execute if data storage fz:survival {snapshot:1b} unless data storage fz:survival installed{datapack: 0b} run tellraw @a [{"text": "[版本信息]FZ's Datapack-","color": "#ffd900"},{"nbt":"version[0]","storage":"fz:survival","color": "#ffd900"},{"text":".","color": "#ffd900"},{"nbt":"version[1]","storage":"fz:survival","color": "#ffd900"},{"text": ".","color": "#ffd900"},{"nbt":"version[2]","storage":"fz:survival","color": "#ffd900"},{"text": ".","color": "#ffd900"},{"nbt":"version[3]","storage":"fz:survival","color": "#ffd900"},{"text": "-SNAPSHOT","color": "red"}]
\ No newline at end of file
diff --git a/data/fz/functions/login/logintips/install.mcfunction b/data/fz/functions/login/logintips/install.mcfunction
index 48cdff3..63a3b7f 100644
--- a/data/fz/functions/login/logintips/install.mcfunction
+++ b/data/fz/functions/login/logintips/install.mcfunction
@@ -1,4 +1,4 @@
 #安装登陆提示
-data merge storage fz.installed {logintips: 1b}
+data modify storage fz:survival installed.logintips set value 1b
 #提示已安装
 tellraw @a {"text": "[信息]登陆提示已安装","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/login/logintips/uninstall.mcfunction b/data/fz/functions/login/logintips/uninstall.mcfunction
index 5b383c3..3799ce9 100644
--- a/data/fz/functions/login/logintips/uninstall.mcfunction
+++ b/data/fz/functions/login/logintips/uninstall.mcfunction
@@ -1,4 +1,4 @@
 #卸载登陆提示
-data merge storage fz.installed {logintips: 0b}
+data modify storage fz:survival installed.logintips set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]登陆提示已卸载","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/login/onlogin.mcfunction b/data/fz/functions/login/onlogin.mcfunction
index d817020..a80ee2b 100644
--- a/data/fz/functions/login/onlogin.mcfunction
+++ b/data/fz/functions/login/onlogin.mcfunction
@@ -1,4 +1,4 @@
-execute if data storage fz.installed {logintips: 1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"}
+execute if data storage fz:survival installed{logintips: 1b} run tellraw @s {"text": "[提醒]站在地面，抬头并按一下shift即可打开设置页面","color": "#66ffff"}
 
 scoreboard players set @s leaveGame 0
 
@@ -14,4 +14,4 @@ advancement revoke @s only fz:scoreboards/digcounter/toolsfix2
 advancement revoke @s only fz:config/sneak
 advancement revoke @s only fz:config/unsneak
 
-advancement revoke @s from fz:leavegame
\ No newline at end of file
+execute if data storage fz:survival installed{datapack: 1b} run advancement revoke @s from fz:leavegame
\ No newline at end of file
diff --git a/data/fz/functions/scoreboards/install.mcfunction b/data/fz/functions/scoreboards/install.mcfunction
index e199649..b0faa7a 100644
--- a/data/fz/functions/scoreboards/install.mcfunction
+++ b/data/fz/functions/scoreboards/install.mcfunction
@@ -118,7 +118,7 @@ scoreboard objectives setdisplay sidebar.team.green tradingCounter
 scoreboard objectives setdisplay sidebar.team.dark_green bedrockBreaked
 scoreboard objectives setdisplay sidebar.team.light_purple fz.aviate1m
 
-data merge storage fz.installed {scoreboards:1b}
+data modify storage fz:survival installed.scoreboards set value 1b
 
 #提示已安装
 tellraw @a {"text": "[信息]记分板已安装","color": "#5fff00"}
diff --git a/data/fz/functions/scoreboards/uninstall.mcfunction b/data/fz/functions/scoreboards/uninstall.mcfunction
index b23db68..3129f09 100644
--- a/data/fz/functions/scoreboards/uninstall.mcfunction
+++ b/data/fz/functions/scoreboards/uninstall.mcfunction
@@ -53,8 +53,8 @@ scoreboard objectives setdisplay sidebar.team.light_purple
 scoreboard objectives setdisplay sidebar.team.green
 scoreboard objectives setdisplay sidebar.team.gold
 
+data modify storage fz:survival installed.scoreboards set value 0b
+
 #提示已卸载
 tellraw @a {"text": "[信息]记分板已卸载","color": "#5fff00"}
-tellraw @s [{"text": "[警告]您要删除计分板数据吗，它将会永久失去！(真的很久！)", "color": "#ffd900"},{"text": "[确定]","clickEvent": {"action": "run_command", "value": "/function fz:scoreboards/delscore"}, "color": "#00ff00"}]
-
-data merge storage fz.installed {scoreboards:0b}
\ No newline at end of file
+tellraw @s [{"text": "[警告]您要删除计分板数据吗，它将会永久失去！(真的很久！)", "color": "#ffd900"},{"text": "[确定]","clickEvent": {"action": "run_command", "value": "/function fz:scoreboards/delscore"}, "color": "#00ff00"}]
\ No newline at end of file
diff --git a/data/fz/functions/start.mcfunction b/data/fz/functions/start.mcfunction
deleted file mode 100644
index 761cf37..0000000
--- a/data/fz/functions/start.mcfunction
+++ /dev/null
@@ -1,7 +0,0 @@
-#判断各功能是否已安装并运行
-execute if data storage fz.installed {scoreboards: 1b} run function fz:scoreboards/start
-execute if data storage fz.installed {sweeper: 1b} run function fz:sweeper/start
-execute if data storage fz.installed {config: 1b} run function fz:config/start
-function fz:carpet/carpet
-#测试用的输出
-tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/start/000x.mcfunction b/data/fz/functions/start/000x.mcfunction
new file mode 100644
index 0000000..03da677
--- /dev/null
+++ b/data/fz/functions/start/000x.mcfunction
@@ -0,0 +1,2 @@
+execute unless score version3 fz.cache = newVersion3 fz.cache run function fz:start/update
+execute if score version3 fz.cache = newVersion3 fz.cache run function fz:start/start
\ No newline at end of file
diff --git a/data/fz/functions/start/00xx.mcfunction b/data/fz/functions/start/00xx.mcfunction
new file mode 100644
index 0000000..9b03286
--- /dev/null
+++ b/data/fz/functions/start/00xx.mcfunction
@@ -0,0 +1,3 @@
+execute unless score version2 fz.cache = newVersion2 fz.cache run function fz:start/update
+execute if data storage fz:survival {snapshot: 1b} if score version2 fz.cache = newVersion2 fz.cache run function fz:start/000x
+execute unless data storage fz:survival {snapshot: 1b} run function fz:start/start
\ No newline at end of file
diff --git a/data/fz/functions/start/start.mcfunction b/data/fz/functions/start/start.mcfunction
new file mode 100644
index 0000000..74e64b4
--- /dev/null
+++ b/data/fz/functions/start/start.mcfunction
@@ -0,0 +1,7 @@
+#判断各功能是否已安装并运行
+execute if data storage fz:survival installed{scoreboards: 1b} run function fz:scoreboards/start
+execute if data storage fz:survival installed{sweeper: 1b} run function fz:sweeper/start
+execute if data storage fz:survival installed{config: 1b} run function fz:config/start
+function fz:carpet/carpet
+#测试用的输出
+tellraw @a {"text": "[信息]启动完毕","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/start/update.mcfunction b/data/fz/functions/start/update.mcfunction
new file mode 100644
index 0000000..e45cfa7
--- /dev/null
+++ b/data/fz/functions/start/update.mcfunction
@@ -0,0 +1,6 @@
+#卸载
+function fz:uninstall
+#安装
+function fz:install
+#提示已安装
+tellraw @a {"text": "[信息]升级完成","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/sweeper/bossbar.mcfunction b/data/fz/functions/sweeper/bossbar.mcfunction
index 901f8d2..d1802ce 100644
--- a/data/fz/functions/sweeper/bossbar.mcfunction
+++ b/data/fz/functions/sweeper/bossbar.mcfunction
@@ -1,4 +1,4 @@
-bossbar set fz.sweeper name [{"score": {"name": "sweeperBossbar","objective": "parameter"},"color": "#ff6100","underlined": true,"bold": true},{"text": "秒后清理垃圾","color": "#ffd900","bold": false}]
-bossbar set fz.sweeper players @a[tag=!fz.sweeperBossbarOff]
+bossbar set fz:sweeper name [{"score": {"name": "sweeperBossbar","objective": "parameter"},"color": "#ff6100","underlined": true,"bold": true},{"text": "秒后清理垃圾","color": "#ffd900","bold": false}]
+bossbar set fz:sweeper players @a[tag=!fz.sweeperBossbarOff]
 scoreboard players remove sweeperBossbar parameter 1
 schedule function fz:sweeper/bossbar 1s
\ No newline at end of file
diff --git a/data/fz/functions/sweeper/config/off.mcfunction b/data/fz/functions/sweeper/config/off.mcfunction
index 93f4d1f..aaac352 100644
--- a/data/fz/functions/sweeper/config/off.mcfunction
+++ b/data/fz/functions/sweeper/config/off.mcfunction
@@ -13,7 +13,7 @@ schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
 #设置怪物血条
-bossbar set minecraft:fz.sweeper visible false
+bossbar set fz:sweeper visible false
 
 tellraw @a[tag=!fz.sweeperMessageOff] {"text": "[信息]扫地机已关闭","color": "#5fff00"}
 execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 2
\ No newline at end of file
diff --git a/data/fz/functions/sweeper/config/on.mcfunction b/data/fz/functions/sweeper/config/on.mcfunction
index 302b44a..f8f98d3 100644
--- a/data/fz/functions/sweeper/config/on.mcfunction
+++ b/data/fz/functions/sweeper/config/on.mcfunction
@@ -17,7 +17,7 @@ schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
 #设置怪物血条
-bossbar set minecraft:fz.sweeper visible true
+bossbar set fz:sweeper visible true
 
 function fz:sweeper/main
 function fz:sweeper/bossbar
\ No newline at end of file
diff --git a/data/fz/functions/sweeper/config/trigger.mcfunction b/data/fz/functions/sweeper/config/trigger.mcfunction
index d3c7de1..480ff15 100644
--- a/data/fz/functions/sweeper/config/trigger.mcfunction
+++ b/data/fz/functions/sweeper/config/trigger.mcfunction
@@ -13,7 +13,7 @@ execute if score @s config matches 1478966205 run tag @s add fz.sweeperMessageOf
 execute if score @s config matches 1478966216 run scoreboard players set keepMinecart parameter 1
 execute if score @s config matches 1478966217 run scoreboard players reset keepMinecart parameter
 
-bossbar set minecraft:fz.sweeper players @a[tag=!fz.sweeperBossbarOff]
+bossbar set fz:sweeper players @a[tag=!fz.sweeperBossbarOff]
 
 scoreboard players reset @s config
 function fz:config/display
\ No newline at end of file
diff --git a/data/fz/functions/sweeper/install.mcfunction b/data/fz/functions/sweeper/install.mcfunction
index 4705a8e..1f8ca2e 100644
--- a/data/fz/functions/sweeper/install.mcfunction
+++ b/data/fz/functions/sweeper/install.mcfunction
@@ -1,6 +1,6 @@
-data merge storage fz.installed {sweeper: 1b}
-bossbar add fz.sweeper {"text":"null"}
-bossbar set fz.sweeper value 0
+data modify storage fz:survival installed.sweeper set value 1b
+bossbar add fz:sweeper {"text":"null"}
+bossbar set fz:sweeper value 0
 #提示已安装
 tellraw @a {"text": "[信息]扫地机已安装","color": "#5fff00"}
 function fz:sweeper/start
\ No newline at end of file
diff --git a/data/fz/functions/sweeper/main.mcfunction b/data/fz/functions/sweeper/main.mcfunction
index 5bce38c..39865ff 100644
--- a/data/fz/functions/sweeper/main.mcfunction
+++ b/data/fz/functions/sweeper/main.mcfunction
@@ -1,5 +1,5 @@
-execute if score keepMinecart parameter matches 1 run execute store result score sweeperItem parameter run kill @e[type=item,predicate=!fz:sweeper/minecart]
-execute unless score keepMinecart parameter matches 1 run execute store result score sweeperItem parameter run kill @e[type=item]
+execute if score keepMinecart parameter matches 1 store result score sweeperItem parameter run kill @e[type=item,predicate=!fz:sweeper/minecart]
+execute unless score keepMinecart parameter matches 1 store result score sweeperItem parameter run kill @e[type=item]
 tellraw @a [{"text": "[信息]本次清理了","color": "#5fff00"},{"score": {"objective": "parameter", "name": "sweeperItem"},"color": "#5fff00"},{"text": "堆物品","color": "#5fff00"}]
 execute as @a[tag=!fz.sweeperSoundOff] at @s run playsound minecraft:block.note_block.pling voice @s ~ ~ ~ 1 2
 execute if score sweeperTime parameter matches 30 run function fz:sweeper/timer/30s
diff --git a/data/fz/functions/sweeper/start.mcfunction b/data/fz/functions/sweeper/start.mcfunction
index 9e39f82..871f393 100644
--- a/data/fz/functions/sweeper/start.mcfunction
+++ b/data/fz/functions/sweeper/start.mcfunction
@@ -11,6 +11,6 @@ schedule clear fz:sweeper/timer/1min
 schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
-bossbar set fz.sweeper visible false
+bossbar set fz:sweeper visible false
 
 tellraw @a {"text": "[信息]扫地机已启用","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/sweeper/uninstall.mcfunction b/data/fz/functions/sweeper/uninstall.mcfunction
index e19627a..cdfc2de 100644
--- a/data/fz/functions/sweeper/uninstall.mcfunction
+++ b/data/fz/functions/sweeper/uninstall.mcfunction
@@ -12,6 +12,8 @@ schedule clear fz:sweeper/timer/2min
 schedule clear fz:sweeper/timer/3min
 schedule clear fz:sweeper/timer/4min
 
-data merge storage fz.installed {sweeper: 0b}
+bossbar remove fz:sweeper
+
+data modify storage fz:survival installed.sweeper set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]扫地机已卸载","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/uninstall.mcfunction b/data/fz/functions/uninstall.mcfunction
index 9f72e0b..e665165 100644
--- a/data/fz/functions/uninstall.mcfunction
+++ b/data/fz/functions/uninstall.mcfunction
@@ -9,6 +9,6 @@ scoreboard objectives remove parameter
 scoreboard objectives remove calculator
 scoreboard objectives remove leaveGame
 #存入已卸载信息，下次启动不会重新安装
-data merge storage fz.installed {installed: 0b}
+data modify storage fz:survival installed.datapack set value 0b
 #提示已卸载
 tellraw @a {"text": "[信息]FZ'sDatapack已卸载","color": "#5fff00"}
\ No newline at end of file
diff --git a/data/fz/functions/update.mcfunction b/data/fz/functions/update.mcfunction
deleted file mode 100644
index 6525bce..0000000
--- a/data/fz/functions/update.mcfunction
+++ /dev/null
@@ -1,12 +0,0 @@
-#卸载
-function fz:uninstall
-#安装
-function fz:install
-#再卸载已经被卸载的项目
-execute if data storage fz.installed {config: 0b} run function fz:config/uninstall
-execute if data storage fz.installed {sweeper: 0b} run function fz:sweeper/uninstall
-execute if data storage fz.installed {scoreboards: 0b} run function fz:scoreboards/uninstall
-execute if data storage fz.installed {health: 0b} run function fz:health/uninstall
-execute if data storage fz.installed {logintips: 0b} run function fz:login/logintips/uninstall
-#提示已安装
-tellraw @a {"text": "[信息]升级完成","color": "#5fff00"}
\ No newline at end of file
diff --git a/restore_scores.sc b/restore_scores.sc
index 44827b7..7470d71 100644
--- a/restore_scores.sc
+++ b/restore_scores.sc
@@ -150,8 +150,14 @@ __restore(pl, s_player) ->(
 	c_for(i = 0, i < length(pl), i += 1,
 		run('player ' + pl:i + ' spawn');
 		game_tick(50);
+		//滑翔距离
+        //mc会统计多一倍的数据，所以除以200
+		aviate = statistic(pl:i, 'custom', 'aviate_one_cm')/200;
+		print(aviate);
+		scoreboard('fz.aviate1m', pl:i, aviate);
+		total_aviate += aviate;
 		//活跃时间
-		actime = statistic(pl:i, 'custom', 'play_one_minute')/72000;
+		actime = statistic(pl:i, 'custom', 'play_time')/72000;
 		print(actime);
 		scoreboard('activation', pl:i, actime);
 		total_actime += actime;
@@ -205,8 +211,9 @@ __restore(pl, s_player) ->(
 	scoreboard('totalList', '总在线时间(h)', total_actime);
 	scoreboard('damageTaken', '群p抖M', total_hurt);
 	scoreboard('totalList', '群p抖M', total_hurt);
+	scoreboard('fz.aviate1m', '总滑翔距离', total_aviate);
+	scoreboard('totalList', '总滑翔距离', total_aviate);
 	game_tick(50);
-    print('完成！');
 	run('function fz:scoreboards/install')
 );
 by_whitelist() ->(
@@ -214,6 +221,6 @@ by_whitelist() ->(
 	s_player = player();
 	game_tick(50);
 	__restore(pl, s_player);
-    print('done! ');
+    print('完成！');
 	return()
 )
\ No newline at end of file
diff --git a/图片示例：设置界面.png b/图片示例：设置界面.png
new file mode 100644
index 0000000..8b53a64
Binary files /dev/null and b/图片示例：设置界面.png differ