diff --git a/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json b/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json
index 100ceb40..e4daac48 100644
--- a/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json
+++ b/xiaofang/Assets/Resources/JsonAsset/GlobalJson.json
@@ -1,662 +1,662 @@
 [
-    {
-        "ID": "90000",
-        "Note": "火势漫延速度",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "1",
-        "Int2": "20",
-        "Int3": "-1",
-        "Float1": "0.5",
-        "Float2": "4",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90001",
-        "Note": "转移伤员的读条时间",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "3",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90002",
-        "Note": "报警电话110",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "110",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "110对应的音频文件路径",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90003",
-        "Note": "报警电话120",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "120",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "120对应的音频文件路径",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90004",
-        "Note": "报警电话119",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "119",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "119对应的音频文件路径",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90005",
-        "Note": "可用于随机障碍物的区域",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "3017",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "3|6",
-        "VectorInt2": "1004|1005|1006",
-        "VectorInt3": "0|1|2",
-        "VectorInt4": "40|40|20",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90006",
-        "Note": "消火栓喷淋距离",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "15",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90007",
-        "Note": "初始火势值",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "1|2|6",
-        "VectorInt2": "10|25|40",
-        "VectorInt3": "100|100|100",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90008",
-        "Note": "NPC处于烟雾覆盖范围时降低健康值的频率",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "5",
-        "Int2": "5",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90009",
-        "Note": "每个可燃物被引燃额外增加的火势值",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "10",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90010",
-        "Note": "需要创建替代角色的职业及替代角色的选择",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "8006",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90011",
-        "Note": "消防队到达时间(演练结束)",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "600",
-        "Int2": "220",
-        "Int3": "60",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90012",
-        "Note": "各楼层教室老师收到的疏散顺序提示文本ID",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "1|2|3|4|5",
-        "VectorInt2": "20003|20004|20005|20006|20007",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90013",
-        "Note": "需要创建替代角色的职业及替代角色的选择",
-        "Scene": "9002",
-        "PlayScript": "5002",
-        "Int1": "8011",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90014",
-        "Note": "惊颤NPC转移点",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "1,1,1|3,3,3|2,2,2",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90015",
-        "Note": "广播通报事故唤醒学生参数",
-        "Scene": "9002",
-        "PlayScript": "5002",
-        "Int1": "1",
-        "Int2": "3",
-        "Int3": "-1",
-        "Float1": "0.2",
-        "Float2": "0.9",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90016",
-        "Note": "总指挥\"无法用于疏散的楼道\"的选择对应给予提示的选项",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "10195",
-        "Int2": "10196",
-        "Int3": "10197",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "10144|10150|10156|10162",
-        "VectorInt2": "10145|10151|10157|10163",
-        "VectorInt3": "10146|10152|10158|10164",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90017",
-        "Note": "下楼队形生效的区域",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "1004|1005|1006",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90018",
-        "Note": "外部增援NPC相关参数",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "90",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "10903|10901|10013",
-        "VectorInt2": "10902|10902|10014",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90019",
-        "Note": "开始扣健康值的火源距离",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "2",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90020",
-        "Note": "穿戴后被烟雾覆盖不会掉健康值的道具",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "3006|3008",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90021",
-        "Note": "未断电时使用消火栓喷洒时的触电几率",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "0.5",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90022",
-        "Note": "爆燃事件发生时xx米范围内的角色负伤/昏迷",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "8",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90023",
-        "Note": "错误操作导致水枪乱喷时，消火栓交互判定范围内的角色的受伤几率",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "0.5",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90024",
-        "Note": "演练经过xx秒后，惊颤状态持续yy秒的NPC转变为负伤状态。",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "300",
-        "Int2": "60",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90025",
-        "Note": "夜间能见度(单位:米)",
-        "Scene": "9002",
-        "PlayScript": "5002",
-        "Int1": "2",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90026",
-        "Note": "门把手温度上升粒度",
-        "Scene": "9002",
-        "PlayScript": "5002",
-        "Int1": "1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90027",
-        "Note": "已掉线人物保留时间",
-        "Scene": "-1",
-        "PlayScript": "-1",
-        "Int1": "30",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90028",
-        "Note": "NPC被消防水枪的水柱冲到的减速比例",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "0.85",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90029",
-        "Note": "警戒线有效性判定参数",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "15",
-        "Int2": "5",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90030",
-        "Note": "救护车到场时间",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "150",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "-1",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90031",
-        "Note": "灭火器喷洒距离",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "-1",
-        "Int2": "-1",
-        "Int3": "-1",
-        "Float1": "2.5",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    },
-    {
-        "ID": "90032",
-        "Note": "扑救计算参数",
-        "Scene": "9003",
-        "PlayScript": "5001",
-        "Int1": "60",
-        "Int2": "10",
-        "Int3": "-1",
-        "Float1": "0.7",
-        "Float2": "-1",
-        "Float3": "-1",
-        "VectorInt1": "-1",
-        "VectorInt2": "-1",
-        "VectorInt3": "-1",
-        "VectorInt4": "-1",
-        "VectorInt5": "-1",
-        "String1": "",
-        "String2": "",
-        "String3": ""
-    }
+  {
+    "ID": "90000",
+    "Note": "火势漫延速度",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "1",
+    "Int2": "20",
+    "Int3": "-1",
+    "Float1": "0.5",
+    "Float2": "4",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90001",
+    "Note": "转移伤员的读条时间",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "3",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90002",
+    "Note": "报警电话110",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "110",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "110对应的音频文件路径",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90003",
+    "Note": "报警电话120",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "120",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "120对应的音频文件路径",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90004",
+    "Note": "报警电话119",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "119",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "119对应的音频文件路径",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90005",
+    "Note": "可用于随机障碍物的区域",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "3017",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "3|6",
+    "VectorInt2": "1004|1005|1006",
+    "VectorInt3": "0|1|2",
+    "VectorInt4": "40|40|20",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90006",
+    "Note": "消火栓喷淋距离",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "15",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90007",
+    "Note": "初始火势值",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "1|2|6",
+    "VectorInt2": "10|25|40",
+    "VectorInt3": "100|100|100",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90008",
+    "Note": "NPC处于烟雾覆盖范围时降低健康值的频率",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "5",
+    "Int2": "5",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90009",
+    "Note": "每个可燃物被引燃额外增加的火势值",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "10",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90010",
+    "Note": "需要创建替代角色的职业及替代角色的选择",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "8006",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90011",
+    "Note": "消防队到达时间(演练结束)",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "600",
+    "Int2": "220",
+    "Int3": "60",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90012",
+    "Note": "各楼层教室老师收到的疏散顺序提示文本ID",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "1|2|3|4|5",
+    "VectorInt2": "20003|20004|20005|20006|20007",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90013",
+    "Note": "需要创建替代角色的职业及替代角色的选择",
+    "Scene": "9002",
+    "PlayScript": "5002",
+    "Int1": "8011",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90014",
+    "Note": "惊颤NPC转移点",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "1,1,1|3,3,3|2,2,2",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90015",
+    "Note": "广播通报事故唤醒学生参数",
+    "Scene": "9002",
+    "PlayScript": "5002",
+    "Int1": "1",
+    "Int2": "3",
+    "Int3": "-1",
+    "Float1": "0.2",
+    "Float2": "0.9",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90016",
+    "Note": "总指挥\"无法用于疏散的楼道\"的选择对应给予提示的选项",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "10195",
+    "Int2": "10196",
+    "Int3": "10197",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "10144|10150|10156|10162",
+    "VectorInt2": "10145|10151|10157|10163",
+    "VectorInt3": "10146|10152|10158|10164",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90017",
+    "Note": "下楼队形生效的区域",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "1004|1005|1006",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90018",
+    "Note": "外部增援NPC相关参数",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "90",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "10903|10901|10013",
+    "VectorInt2": "10902|10902|10014",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90019",
+    "Note": "开始扣健康值的火源距离",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "2",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90020",
+    "Note": "穿戴后被烟雾覆盖不会掉健康值的道具",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "3006|3008",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90021",
+    "Note": "未断电时使用消火栓喷洒时的触电几率",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "0.5",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90022",
+    "Note": "爆燃事件发生时xx米范围内的角色负伤/昏迷",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "8",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90023",
+    "Note": "错误操作导致水枪乱喷时，消火栓交互判定范围内的角色的受伤几率",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "0.5",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90024",
+    "Note": "演练经过xx秒后，惊颤状态持续yy秒的NPC转变为负伤状态。",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "300",
+    "Int2": "60",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90025",
+    "Note": "夜间能见度(单位:米)",
+    "Scene": "9002",
+    "PlayScript": "5002",
+    "Int1": "2",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90026",
+    "Note": "门把手温度上升粒度",
+    "Scene": "9002",
+    "PlayScript": "5002",
+    "Int1": "1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90027",
+    "Note": "已掉线人物保留时间",
+    "Scene": "-1",
+    "PlayScript": "-1",
+    "Int1": "30",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90028",
+    "Note": "NPC被消防水枪的水柱冲到的减速比例",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "0.85",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90029",
+    "Note": "警戒线有效性判定参数",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "15",
+    "Int2": "5",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90030",
+    "Note": "救护车到场时间",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "150",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "-1",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90031",
+    "Note": "灭火器喷洒距离",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "-1",
+    "Int2": "-1",
+    "Int3": "-1",
+    "Float1": "2.5",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  },
+  {
+    "ID": "90032",
+    "Note": "扑救计算参数",
+    "Scene": "9003",
+    "PlayScript": "5001",
+    "Int1": "60",
+    "Int2": "10",
+    "Int3": "-1",
+    "Float1": "0.7",
+    "Float2": "-1",
+    "Float3": "-1",
+    "VectorInt1": "-1",
+    "VectorInt2": "-1",
+    "VectorInt3": "-1",
+    "VectorInt4": "-1",
+    "VectorInt5": "-1",
+    "String1": "",
+    "String2": "",
+    "String3": ""
+  }
 ]
\ No newline at end of file
diff --git a/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json b/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json
index 49c7afc9..731a2bd1 100644
--- a/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json	
+++ b/xiaofang/Assets/Resources/JsonAsset/IncidentSite .json	
@@ -9,7 +9,8 @@
     "Difficulty": "1|2|6",
     "SpecialEvent": "-1,-1,-1,-1|1,50,10,20|1,50,20,20",
     "Role": "8000,8001,8002,8003,8004,8005,8006,8008,8009|8000,8001,8002,8003,8004,8005,8006,8008,8009|8000,8001,8002,8003,8004,8005,8006,8008,8009,8010",
-    "GeneralRole": "8000,8001,8002,8003,8004,8005,8006,8008,8009,8010"
+    "GeneralRole": "8000,8001,8002,8003,8004,8005,8006,8008,8009,8010",
+    "ItemPos": "-1#3016,2,1,2,3#3016,2,1,2,3|3016,2,2,2,2"
   },
   {
     "ID": "2002",
@@ -21,30 +22,7 @@
     "Difficulty": "1|2|3",
     "SpecialEvent": "-1,-1,-1,-1|1,50,10,20|1,50,20,20",
     "Role": "8000,8001,8002,8003,8004,8005,8007,8011|8000,8001,8002,8003,8004,8005,8007,8011|8000,8001,8002,8003,8004,8005,8007,8011",
-    "GeneralRole": "8000,8001,8002,8003,8004,8005,8007,8010,8011"
-  },
-  {
-    "ID": "2003",
-    "Note": "test1",
-    "Name": "2003",
-    "Scene": "9003",
-    "Position": "1,1,1",
-    "Volume": "-1",
-    "Difficulty": "2|3",
-    "SpecialEvent": "-1,-1,-1,-1|1,50,10,20",
-    "Role": "8001,8002,8003,8004,8005|8001,8002,8003,8004,8005",
-    "GeneralRole": "8010"
-  },
-  {
-    "ID": "2004",
-    "Note": "test2",
-    "Name": "2004",
-    "Scene": "9003",
-    "Position": "2,2,2",
-    "Volume": "-1",
-    "Difficulty": "1|5|6",
-    "SpecialEvent": "-1,-1,-1,-1|1,50,10,20|1,50,20,20",
-    "Role": "8000,8001,8002,8003,8004,8005,8006,8008,8009|8000,8001,8002,8003,8004,8005,8006,8008,8009|8000,8001,8002,8003,8004,8005,8006,8008,8009,8010",
-    "GeneralRole": "8010"
+    "GeneralRole": "8000,8001,8002,8003,8004,8005,8007,8010,8011",
+    "ItemPos": "-1"
   }
 ]
\ No newline at end of file
diff --git a/xiaofang/Assets/Resources/JsonAsset/Matial.json b/xiaofang/Assets/Resources/JsonAsset/Matial.json
index bfd98755..b5ae5a62 100644
--- a/xiaofang/Assets/Resources/JsonAsset/Matial.json
+++ b/xiaofang/Assets/Resources/JsonAsset/Matial.json
@@ -1,274 +1,291 @@
 [
-    {
-        "ID": 3001,
-        "Note": "消防水枪",
-        "Type": 1,
-        "Name": 3001,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_001",
-        "ResPath": "\\ASSETS\\a001.Prefeb",
-        "ConsumableType": 0,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3002,
-        "Note": "消防水带",
-        "Type": 1,
-        "Name": 3002,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_002",
-        "ResPath": "\\ASSETS\\a002.Prefeb",
-        "ConsumableType": 0,
-        "Durations": -1,
-        "Attribute": "14,20",
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3003,
-        "Note": "灭火器",
-        "Type": 1,
-        "Name": 3003,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": "8002|8003",
-        "Icon": "icon_003",
-        "ResPath": "\\ASSETS\\a003.Prefeb",
-        "ConsumableType": 1,
-        "Durations": 30,
-        "Attribute": "15,30",
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3004,
-        "Note": "消防水桶",
-        "Type": 2,
-        "Name": 3004,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_004",
-        "ResPath": "\\ASSETS\\a004.Prefeb",
-        "ConsumableType": 0,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3005,
-        "Note": "灭火战斗服",
-        "Type": 3,
-        "Name": 3005,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_005",
-        "ResPath": "\\ASSETS\\a005.Prefeb",
-        "ConsumableType": 2,
-        "Durations": -1,
-        "Attribute": "5,20",
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3006,
-        "Note": "防护面具",
-        "Type": 3,
-        "Name": 3006,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_006",
-        "ResPath": "\\ASSETS\\a006.Prefeb",
-        "ConsumableType": 3,
-        "Durations": -1,
-        "Attribute": "5,40",
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3007,
-        "Note": "防护手套",
-        "Type": 3,
-        "Name": 3007,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_007",
-        "ResPath": "\\ASSETS\\a007.Prefeb",
-        "ConsumableType": 2,
-        "Durations": -1,
-        "Attribute": "5,20",
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3008,
-        "Note": "正压式空气呼吸器",
-        "Type": 3,
-        "Name": 3008,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_008",
-        "ResPath": "\\ASSETS\\a008.Prefeb",
-        "ConsumableType": 3,
-        "Durations": 300,
-        "Attribute": -1,
-        "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3009,
-        "Note": "隔离警示带",
-        "Type": 4,
-        "Name": 3009,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_009",
-        "ResPath": "\\ASSETS\\a009.Prefeb",
-        "ConsumableType": 1,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3010,
-        "Note": "锥形事故标志柱",
-        "Type": 4,
-        "Name": 3010,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": "8008|8009",
-        "Icon": "icon_010",
-        "ResPath": "\\ASSETS\\a010.Prefeb",
-        "ConsumableType": 1,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3011,
-        "Note": "警戒标志杆",
-        "Type": 4,
-        "Name": 3011,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": "8008|8009",
-        "Icon": "icon_011",
-        "ResPath": "\\ASSETS\\a011.Prefeb",
-        "ConsumableType": 1,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3012,
-        "Note": "头戴式照明灯",
-        "Type": 5,
-        "Name": 3012,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_012",
-        "ResPath": "\\ASSETS\\a012.Prefeb",
-        "ConsumableType": 2,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3013,
-        "Note": "手电筒",
-        "Type": 5,
-        "Name": 3013,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_013",
-        "ResPath": "\\ASSETS\\a013.Prefeb",
-        "ConsumableType": 0,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3014,
-        "Note": "对讲机",
-        "Type": 4,
-        "Name": 3014,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": -1,
-        "Icon": "icon_014",
-        "ResPath": "\\ASSETS\\a014.Prefeb",
-        "ConsumableType": 0,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3015,
-        "Note": "急救医疗箱",
-        "Type": 7,
-        "Name": 3015,
-        "Weight": 1,
-        "Scene ": 9003,
-        "RoleLimit": "8004|8005",
-        "Icon": "icon_015",
-        "ResPath": "\\ASSETS\\a015.Prefeb",
-        "ConsumableType": 1,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8001,1|8002,1|8003,0|8004,0|8005,0|8006,0",
-        "PutInStore": 1
-    },
-    {
-        "ID": 3016,
-        "Note": "易燃物1",
-        "Type": 0,
-        "Name": 3016,
-        "Weight": 2,
-        "Scene ": 9003,
-        "RoleLimit": 8006,
-        "Icon": "icon_016",
-        "ResPath": "\\ASSETS\\a016.Prefeb",
-        "ConsumableType": 0,
-        "Durations": -1,
-        "Attribute": "16,1",
-        "IsPickup": "8000,0|8001,0|8002,0|8003,0|8004,0|8005,0|8006,1|8007,0|8008,0|8009,0|8010,0|8011,0",
-        "PutInStore": 0
-    },
-    {
-        "ID": 3017,
-        "Note": "可转移的障碍物",
-        "Type": 0,
-        "Name": 3017,
-        "Weight": 2,
-        "Scene ": 9003,
-        "RoleLimit": 8006,
-        "Icon": "icon_017",
-        "ResPath": "\\ASSETS\\a017.Prefeb",
-        "ConsumableType": 0,
-        "Durations": -1,
-        "Attribute": -1,
-        "IsPickup": "8000,0|8001,0|8002,0|8003,0|8004,0|8005,0|8006,1|8007,0|8008,0|8009,0|8010,0|8011,0",
-        "PutInStore": 0
-    }
+  {
+    "ID": "3001",
+    "Note": "消防水枪",
+    "Type": "1",
+    "Name": "3001",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_001",
+    "ResPath": "\\ASSETS\\a001.Prefeb",
+    "ConsumableType": "0",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3002",
+    "Note": "消防水带",
+    "Type": "1",
+    "Name": "3002",
+    "Weight": "2",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_002",
+    "ResPath": "\\ASSETS\\a002.Prefeb",
+    "ConsumableType": "0",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "14,20",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3003",
+    "Note": "灭火器",
+    "Type": "1",
+    "Name": "3003",
+    "Weight": "2",
+    "Scene ": "9003",
+    "RoleLimit": "8002|8003",
+    "Icon": "icon_003",
+    "ResPath": "\\ASSETS\\a003.Prefeb",
+    "ConsumableType": "1",
+    "WearingTime": "-1",
+    "Durations": "30",
+    "Attribute": "15,30",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3004",
+    "Note": "消防水桶",
+    "Type": "2",
+    "Name": "3004",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_004",
+    "ResPath": "\\ASSETS\\a004.Prefeb",
+    "ConsumableType": "0",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3005",
+    "Note": "灭火战斗服",
+    "Type": "3",
+    "Name": "3005",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_005",
+    "ResPath": "\\ASSETS\\a005.Prefeb",
+    "ConsumableType": "2",
+    "WearingTime": "3",
+    "Durations": "-1",
+    "Attribute": "5,20",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3006",
+    "Note": "防护面具",
+    "Type": "3",
+    "Name": "3006",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_006",
+    "ResPath": "\\ASSETS\\a006.Prefeb",
+    "ConsumableType": "3",
+    "WearingTime": "1",
+    "Durations": "-1",
+    "Attribute": "5,40",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3007",
+    "Note": "防护手套",
+    "Type": "3",
+    "Name": "3007",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_007",
+    "ResPath": "\\ASSETS\\a007.Prefeb",
+    "ConsumableType": "2",
+    "WearingTime": "1",
+    "Durations": "-1",
+    "Attribute": "5,20",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3008",
+    "Note": "正压式空气呼吸器",
+    "Type": "3",
+    "Name": "3008",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_008",
+    "ResPath": "\\ASSETS\\a008.Prefeb",
+    "ConsumableType": "3",
+    "WearingTime": "2",
+    "Durations": "300",
+    "Attribute": "-1",
+    "IsPickup": "8001,0|8002,0|8003,1|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3009",
+    "Note": "隔离警示带",
+    "Type": "4",
+    "Name": "3009",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_009",
+    "ResPath": "\\ASSETS\\a009.Prefeb",
+    "ConsumableType": "1",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3010",
+    "Note": "锥形事故标志柱",
+    "Type": "4",
+    "Name": "3010",
+    "Weight": "2",
+    "Scene ": "9003",
+    "RoleLimit": "8008|8009",
+    "Icon": "icon_010",
+    "ResPath": "\\ASSETS\\a010.Prefeb",
+    "ConsumableType": "1",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3011",
+    "Note": "警戒标志杆",
+    "Type": "4",
+    "Name": "3011",
+    "Weight": "2",
+    "Scene ": "9003",
+    "RoleLimit": "8008|8009",
+    "Icon": "icon_011",
+    "ResPath": "\\ASSETS\\a011.Prefeb",
+    "ConsumableType": "1",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3012",
+    "Note": "头戴式照明灯",
+    "Type": "5",
+    "Name": "3012",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_012",
+    "ResPath": "\\ASSETS\\a012.Prefeb",
+    "ConsumableType": "2",
+    "WearingTime": "1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3013",
+    "Note": "手电筒",
+    "Type": "5",
+    "Name": "3013",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_013",
+    "ResPath": "\\ASSETS\\a013.Prefeb",
+    "ConsumableType": "0",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3014",
+    "Note": "对讲机",
+    "Type": "4",
+    "Name": "3014",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "-1",
+    "Icon": "icon_014",
+    "ResPath": "\\ASSETS\\a014.Prefeb",
+    "ConsumableType": "0",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,1|8002,0|8003,0|8004,0|8005,0|8006,0",
+    "PutInStore": "0"
+  },
+  {
+    "ID": "3015",
+    "Note": "急救医疗箱",
+    "Type": "7",
+    "Name": "3015",
+    "Weight": "1",
+    "Scene ": "9003",
+    "RoleLimit": "8004|8005",
+    "Icon": "icon_015",
+    "ResPath": "\\ASSETS\\a015.Prefeb",
+    "ConsumableType": "1",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8001,1|8002,1|8003,0|8004,0|8005,0|8006,0",
+    "PutInStore": "1"
+  },
+  {
+    "ID": "3016",
+    "Note": "易燃物1",
+    "Type": "0",
+    "Name": "3016",
+    "Weight": "4",
+    "Scene ": "9003",
+    "RoleLimit": "8006",
+    "Icon": "icon_016",
+    "ResPath": "\\ASSETS\\a016.Prefeb",
+    "ConsumableType": "0",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "16,1",
+    "IsPickup": "8000,0|8001,0|8002,0|8003,0|8004,0|8005,0|8006,1|8007,0|8008,0|8009,0|8010,0|8011,0",
+    "PutInStore": "0"
+  },
+  {
+    "ID": "3017",
+    "Note": "可转移的障碍物",
+    "Type": "0",
+    "Name": "3017",
+    "Weight": "4",
+    "Scene ": "9003",
+    "RoleLimit": "8006",
+    "Icon": "icon_017",
+    "ResPath": "\\ASSETS\\a017.Prefeb",
+    "ConsumableType": "0",
+    "WearingTime": "-1",
+    "Durations": "-1",
+    "Attribute": "-1",
+    "IsPickup": "8000,0|8001,0|8002,0|8003,0|8004,0|8005,0|8006,1|8007,0|8008,0|8009,0|8010,0|8011,0",
+    "PutInStore": "0"
+  }
 ]
\ No newline at end of file
diff --git a/xiaofang/Assets/Script/DirllInterface/createTemplateInterface.cs b/xiaofang/Assets/Script/DirllInterface/createTemplateInterface.cs
index 2507fd17..dfc53d09 100644
--- a/xiaofang/Assets/Script/DirllInterface/createTemplateInterface.cs
+++ b/xiaofang/Assets/Script/DirllInterface/createTemplateInterface.cs
@@ -60,7 +60,7 @@ public class NpcList//NPC
 {
     public string npcId;//NPC���--------------------------------����
     public string areaId;//������------------------------------����
-    public int num;//����--------------------------------����
+    public int npcNum;//����--------------------------------����
     public int isHere;//�Ƿ����
 }
 public class MaterialList//�豸�����б�
diff --git a/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
index d2f4af31..6dfd8c75 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
@@ -58,6 +58,7 @@ public class DatePanel : MonoBehaviour
             createTemplateInfo.Instance.auth_CreateTemplate.isTemplate = "1";
         }
         panel.UploadData();
+        Debug.LogError("+++++++++");
         createTemplateInterface.createTemplate(dataText.text);
     }
 
diff --git a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
index 3a0cc0dc..332eb326 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
@@ -85,7 +85,7 @@ public class EvacuationPanel : MonoBehaviour
             nPC.npcId = npcInfo.npcId.ToString();
             nPC.areaId = npcInfo.sceneId.ToString();
             nPC.isHere=npcInfo.isHere;
-            nPC.num = npcInfo.NpcNum;
+            nPC.npcNum = npcInfo.NpcNum;
             
             createTemplateInfo.Instance.auth_CreateTemplate.npcList.Add(nPC);
         }
@@ -363,7 +363,6 @@ public class EvacuationPanel : MonoBehaviour
 
         // 3. ɸѡ��Ч�ķ�������ʣ��� personnelItems��
         List<PersonnelItem> validAreas = personnelItems.Where(item => item.NpcNum >= 0).ToList();
-
         if (validAreas.Count == 0)
         {
             Debug.LogWarning("No valid areas available for redistribution.");
@@ -403,7 +402,6 @@ public class EvacuationPanel : MonoBehaviour
                 targetItem.NpcNum += kvp.Value;             // ���� NPC ����
                 targetItem.SetInfo(targetItem.NpcNum.ToString()); // ���� UI ��ʾ
                 targetItem.personnelImage.gameObject.SetActive(true); // ȷ��ͼ��ɼ�
-                Debug.Log($"Randomly redistributed {kvp.Value} NPCs to Scene ID: {kvp.Key}");
             }
         }
     }