From 7cf74ef71a4b15f707a4717d40c78dae7044c3a7 Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Wed, 18 Dec 2024 09:23:40 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=BA=94=E6=80=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Script/Scheduled_03/Panel.cs | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
index c1741f68..ebb03b9a 100644
--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@@ -115,27 +115,27 @@ public class Panel : MonoBehaviour
         //动态加载人员
     public async void DynamicLoadingPeople()
     {
-        for(int i=0;i<10;i++)
-        {
-            GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
-            PeopleItem peopleItem = item.GetComponent<PeopleItem>();
-            peopleItem.nameText.text = "角色1";
-            peopleItem.peopleId = "0";
-            Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
-            peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
-            peopleList.Add(item);// 将每个实例化的角色添加到列表中
-        }
-        //PlayerListResponse playerListResponse=await userInfo.GetPlayerList();
-        //foreach(PlayerListData player in playerListResponse.data)
+        //for(int i=0;i<10;i++)
         //{
         //    GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
         //    PeopleItem peopleItem = item.GetComponent<PeopleItem>();
-        //    peopleItem.nameText.text = player.NickName;
-        //    peopleItem.peopleId = player.UserId;
+        //    peopleItem.nameText.text = "角色1";
+        //    peopleItem.peopleId = "0";
         //    Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
         //    peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
         //    peopleList.Add(item);// 将每个实例化的角色添加到列表中
         //}
+        PlayerListResponse playerListResponse = await userInfo.GetPlayerList();
+        foreach (PlayerListData player in playerListResponse.data)
+        {
+            GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
+            PeopleItem peopleItem = item.GetComponent<PeopleItem>();
+            peopleItem.nameText.text = player.NickName;
+            peopleItem.peopleId = player.UserId;
+            Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
+            peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
+            peopleList.Add(item);// 将每个实例化的角色添加到列表中
+        }
     }
 
     //动态加载职责

From 71e68b463cb856d3a29b81763b7c4f926cd9e1a8 Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Wed, 18 Dec 2024 10:22:19 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=BA=94=E6=80=A5=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E4=B8=8A=E4=BC=A0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Resources/JsonAsset/Area.json | 174 +++++++++---------
 xiaofang/Assets/Scenes/Schedule_03.unity      |   4 +
 xiaofang/Assets/Scenes/loginscene.unity       |   4 +-
 xiaofang/Assets/Script/Scheduled_03/Panel.cs  |  12 +-
 .../Assets/Script/UI/PanelUI/DatePanel.cs     |   2 +
 5 files changed, 101 insertions(+), 95 deletions(-)

diff --git a/xiaofang/Assets/Resources/JsonAsset/Area.json b/xiaofang/Assets/Resources/JsonAsset/Area.json
index a5b64e08..0499dcc1 100644
--- a/xiaofang/Assets/Resources/JsonAsset/Area.json
+++ b/xiaofang/Assets/Resources/JsonAsset/Area.json
@@ -6,7 +6,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,19.34,0.21,8.86|1,18.85,0.21,0.76",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8002,1|2001,1,8003,1|2001,2,8002,1|2001,2,8003,1|2001,6,8002,1|2001,6,8003,1",
@@ -19,7 +19,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,8.99,3.45,-25.51",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8004,-1|2001,1,8005,1|2001,2,8004,-1|2001,2,8005,1|2001,6,8004,-1|2001,6,8005,1",
@@ -32,7 +32,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,-14.54,0.21,23.57",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8002,1|2001,2,8002,1|2001,6,8002,1",
@@ -43,9 +43,9 @@
     "Note": "鎿嶅満",
     "Name": "50003",
     "Scene": "9003",
-    "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
+    "Range": "5.47,0.01,-47.29|-13.96,0.01,-47.29|-13.96,0.01,-27.65|-25.89,0.01,-27.65|-25.89,0.01,19.13|11.29,0.01,19.13|11.29,0.01,-1.26|5.7,0.01,-1.26",
     "NpcRatio": "2001,6,6001,0,19.22,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "2,0,0.17,0|1.5,-18.11,0.17,-13.1|1,-17.55,0.17,11.44",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,6,8002,1|2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,1,8001,1|2001,2,8001,1|2001,6,8001,1",
@@ -56,7 +56,7 @@
     "Note": "1鍙锋ゼ閬�",
     "Name": "50004",
     "Scene": "9003",
-    "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
+    "Range": "-22.46,13.17,-51.83|-22.45,13.17,-48.18|-20.07,13.17,-48.18|-20.07,11.8,-59.36|-22.48,11.8,-59.36|-22.48,9.95,-48.27|-20.07,9.95,-48.27|-20.07,8.56,-59.39|-22.45,8.56,-59.39|-22.45,6.73,-48.31|-20.07,6.73,-48.31|-20.07,5.29,-59.28|-22.28,5.29,-59.28|-22.28,3.5,-48.26|-20.07,3.5,-48.26|-20.07,1.89,-59.26|-22.42,1.89,-59.26|-22.42,0.21,-50.75|-21.56,0.21,-50.75|-21.56,1.89,-57.62|-21.2,1.89,-57.62|-21.198,3.5,-51.55|-21.56,3.5,-51.55|-21.56,5.29,-57.78|-21.18,5.29,-57.78|-21.18,6.73,-51.59|-21.52,6.73,-51.59|-21.52,8.56,-57.7|-21.18,8.56,-57.7|-21.18,9.95,-51.54|-21.5,9.95,-51.54|-21.502,11.8,-57.74|-21.2,11.8,-57.74|-21.2,13.17,-51.57",
     "NpcRatio": "2001,6,6001,0,1.28,0",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -69,7 +69,7 @@
     "Note": "2鍙锋ゼ閬�",
     "Name": "50005",
     "Scene": "9003",
-    "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
+    "Range": "-22.46,13.17,-51.83|-22.45,13.17,-48.18|-20.07,13.17,-48.18|-20.07,11.8,-59.36|-22.48,11.8,-59.36|-22.48,9.95,-48.27|-20.07,9.95,-48.27|-20.07,8.56,-59.39|-22.45,8.56,-59.39|-22.45,6.73,-48.31|-20.07,6.73,-48.31|-20.07,5.29,-59.28|-22.28,5.29,-59.28|-22.28,3.5,-48.26|-20.07,3.5,-48.26|-20.07,1.89,-59.26|-22.42,1.89,-59.26|-22.42,0.21,-50.75|-21.56,0.21,-50.75|-21.56,1.89,-57.62|-21.2,1.89,-57.62|-21.198,3.5,-51.55|-21.56,3.5,-51.55|-21.56,5.29,-57.78|-21.18,5.29,-57.78|-21.18,6.73,-51.59|-21.52,6.73,-51.59|-21.52,8.56,-57.7|-21.18,8.56,-57.7|-21.18,9.95,-51.54|-21.5,9.95,-51.54|-21.502,11.8,-57.74|-21.2,11.8,-57.74|-21.2,13.17,-51.57",
     "NpcRatio": "2001,6,6001,0,1.28,0",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -82,7 +82,7 @@
     "Note": "3鍙锋ゼ閬�",
     "Name": "50006",
     "Scene": "9003",
-    "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
+    "Range": "-22.46,13.17,-51.83|-22.45,13.17,-48.18|-20.07,13.17,-48.18|-20.07,11.8,-59.36|-22.48,11.8,-59.36|-22.48,9.95,-48.27|-20.07,9.95,-48.27|-20.07,8.56,-59.39|-22.45,8.56,-59.39|-22.45,6.73,-48.31|-20.07,6.73,-48.31|-20.07,5.29,-59.28|-22.28,5.29,-59.28|-22.28,3.5,-48.26|-20.07,3.5,-48.26|-20.07,1.89,-59.26|-22.42,1.89,-59.26|-22.42,0.21,-50.75|-21.56,0.21,-50.75|-21.56,1.89,-57.62|-21.2,1.89,-57.62|-21.198,3.5,-51.55|-21.56,3.5,-51.55|-21.56,5.29,-57.78|-21.18,5.29,-57.78|-21.18,6.73,-51.59|-21.52,6.73,-51.59|-21.52,8.56,-57.7|-21.18,8.56,-57.7|-21.18,9.95,-51.54|-21.5,9.95,-51.54|-21.502,11.8,-57.74|-21.2,11.8,-57.74|-21.2,13.17,-51.57",
     "NpcRatio": "2001,6,6001,0,1.28,0",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -97,7 +97,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "0.6,6.08,0.2,-48.65",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,1,8009,1|2001,2,8008,-1|2001,2,8009,1|2001,6,8008,-1|2001,6,8009,1",
@@ -110,7 +110,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,-7.62,0.21,-54.14",
     "Oversee": "8006,1",
     "EndPoint": "1042",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -123,7 +123,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,0.79,0.21,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1043",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -136,7 +136,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,9.26,0.21,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1044",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -149,7 +149,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,17.73,0.21,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1045",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -175,7 +175,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,-7.62,3.45,-54.14",
     "Oversee": "8006,1",
     "EndPoint": "1047",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -188,7 +188,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,0.79,3.45,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1048",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -201,7 +201,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,9.26,3.45,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1049",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -214,7 +214,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,17.73,3.45,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1050",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -227,7 +227,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,26.18,6.73,-54.842",
     "Oversee": "8006,1",
     "EndPoint": "1051",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -240,7 +240,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,0.79,6.73,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1052",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -253,7 +253,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,9.26,6.73,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1053",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -266,7 +266,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,17.73,6.73,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1054",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -279,7 +279,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,26.18,9.95,-54.842",
     "Oversee": "8006,1",
     "EndPoint": "1055",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -292,7 +292,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,18.37,9.95,-36.78",
     "Oversee": "8006,1",
     "EndPoint": "1056",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -305,7 +305,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,-7.62,9.95,-54.14",
     "Oversee": "8006,1",
     "EndPoint": "1057",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -318,7 +318,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,0.79,9.95,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1058",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -331,7 +331,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,9.26,9.95,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1059",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -344,7 +344,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,17.73,9.95,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1060",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -357,7 +357,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,26.18,13.17,-54.842",
     "Oversee": "8006,1",
     "EndPoint": "1046",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -370,7 +370,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,18.37,9.93,-28.65",
     "Oversee": "8006,1",
     "EndPoint": "1061",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -383,7 +383,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,18.37,9.93,-20.54",
     "Oversee": "8006,1",
     "EndPoint": "1062",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -396,7 +396,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,18.37,9.93,-12.47",
     "Oversee": "8006,1",
     "EndPoint": "1063",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -409,7 +409,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,18.37,9.93,16.59",
     "Oversee": "8006,1",
     "EndPoint": "1064",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -435,7 +435,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,18.37,13.17,-20.54",
     "Oversee": "8006,1",
     "EndPoint": "1066",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -448,7 +448,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,-7.62,13.17,-54.14",
     "Oversee": "8006,1",
     "EndPoint": "1067",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -461,7 +461,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,0.79,13.17,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1068",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -474,7 +474,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,9.26,13.17,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1069",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -487,7 +487,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,17.73,13.17,-54.84",
     "Oversee": "8006,1",
     "EndPoint": "1070",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -500,7 +500,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1,18.37,13.17,-28.65",
     "Oversee": "8006,1",
     "EndPoint": "1071",
     "RoleLimit": "2001,1,8006,1|2001,2,8006,1",
@@ -511,7 +511,7 @@
     "Note": "1-1鐝搷鍦轰綅缃�",
     "Name": "50039",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-13.5,0.01,-44.1|-11.5,0.01,-44.1|-11.5,0.01,-27.1|-13.5,0.01,-27.1",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -524,7 +524,7 @@
     "Note": "1-2鐝搷鍦轰綅缃�",
     "Name": "50040",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-10,0.01,-44.1|-8,0.01,-44.1|-8,0.01,-27.1|-10,0.01,-27.1",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -537,7 +537,7 @@
     "Note": "1-3鐝搷鍦轰綅缃�",
     "Name": "50041",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-8,0.01,-44.1|-6,0.01,-44.1|-6,0.01,-27.1|-8,.01,-27.1",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -550,7 +550,7 @@
     "Note": "1-4鐝搷鍦轰綅缃�",
     "Name": "50042",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-3,0.01,-44.1|-1,0.01,-44.1|-1,0.01,-27.1|-3,0.01,-27.1",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -563,7 +563,7 @@
     "Note": "4-5鐝搷鍦轰綅缃�",
     "Name": "50043",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-9.85,0.01,-25.2|-11.65,0.01,-25.2|-11.65,0.01,-6|-9.85,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -576,7 +576,7 @@
     "Note": "2-1鐝搷鍦轰綅缃�",
     "Name": "50044",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-24.85,0.01,-3.8|-24.85,0.01,15.2|-26.65,0.01,15.2|-26.65,0.01,-3.8",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -589,7 +589,7 @@
     "Note": "2-2鐝搷鍦轰綅缃�",
     "Name": "50045",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-21.85,0.01,15.2|-21.85,0.01,-3.8|-23.65,0.01,-3.8|-23.65,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -602,7 +602,7 @@
     "Note": "2-3鐝搷鍦轰綅缃�",
     "Name": "50046",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-18.85,0.01,15.2|-18.85,0.01,-3.8|-20.65,0.01,-3.8|-20.65,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -615,7 +615,7 @@
     "Note": "2-4鐝搷鍦轰綅缃�",
     "Name": "50047",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-17.65,0.01,-3.8|-15.85,0.01,-3.8|-15.85,0.01,15.2|-17.65,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -628,7 +628,7 @@
     "Note": "2-5鐝搷鍦轰綅缃�",
     "Name": "50048",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-12.85,0.01,-3.8|-14.65,0.01,-3.8|-14.65,0.01,15.2|-12.85,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -641,7 +641,7 @@
     "Note": "3-1鐝搷鍦轰綅缃�",
     "Name": "50049",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-9.85,0.01,-3.8|-11.65,0.01,-3.8|-11.65,0.01,15.2|-9.85,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -654,7 +654,7 @@
     "Note": "3-2鐝搷鍦轰綅缃�",
     "Name": "50050",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-6.85,0.01,-3.8|-8.65,0.01,-3.8|-8.65,0.01,15.2|-6.85,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -667,7 +667,7 @@
     "Note": "3-3鐝搷鍦轰綅缃�",
     "Name": "50051",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-3.85,0.01,-3.8|-5.65,0.01,-3.8|-5.65,0.01,15.2|-3.85,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -680,7 +680,7 @@
     "Note": "3-4鐝搷鍦轰綅缃�",
     "Name": "50052",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "3.15,0.01,-3.8|1.35,0.01,-3.8|1.35,0.01,15.2|3.15,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -693,7 +693,7 @@
     "Note": "3-5鐝搷鍦轰綅缃�",
     "Name": "50053",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "0.15,0.01,-3.8|-1.65,0.01,-3.8|-1.65,0.01,15.2|0.15,0.01,15.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -706,7 +706,7 @@
     "Note": "4-1鐝搷鍦轰綅缃�",
     "Name": "50054",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-21.85,0.01,-6|-21.85,0.01,-25.2|-23.65,0.01,-25.2|-23.65,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -719,7 +719,7 @@
     "Note": "4-2鐝搷鍦轰綅缃�",
     "Name": "50055",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-18.85,0.01,-6|-18.85,0.01,-25.2|-20.65,0.01,-25.2|-20.65,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -732,7 +732,7 @@
     "Note": "4-3鐝搷鍦轰綅缃�",
     "Name": "50056",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-17.65,0.01,-25.2|-15.85,0.01,-25.2|-15.85,0.01,-6|-17.65,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -745,7 +745,7 @@
     "Note": "4-4鐝搷鍦轰綅缃�",
     "Name": "50057",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-12.85,0.01,-25.2|-14.65,0.01,-25.2|-14.65,0.01,-6|-12.85,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -758,7 +758,7 @@
     "Note": "5-1鐝搷鍦轰綅缃�",
     "Name": "50058",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "3.15,0.01,-25.2|1.35,0.01,-25.2|1.35,0.01,-6|3.15,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -771,7 +771,7 @@
     "Note": "5-2鐝搷鍦轰綅缃�",
     "Name": "50059",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "0.15,0.01,-25.2|-1.65,0.01,-25.2|-1.65,0.01,-6|0.15,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -784,7 +784,7 @@
     "Note": "5-3鐝搷鍦轰綅缃�",
     "Name": "50060",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-3.85,0.01,-25.2|-5.65,0.01,-25.2|-5.65,0.01,-6|-3.85,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -797,7 +797,7 @@
     "Note": "5-4鐝搷鍦轰綅缃�",
     "Name": "50061",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-6.85,0.01,-25.2|-8.65,0.01,-25.2|-8.65,0.01,-6|-6.85,0.01,-6",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -810,7 +810,7 @@
     "Note": "6-6鐝搷鍦轰綅缃�",
     "Name": "50062",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "23.86,0.01,-24|31.35,0.01,-24|31.35,0.01,-10.32|23.86,0.01,-10.32",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -823,7 +823,7 @@
     "Note": "6-1鐝搷鍦轰綅缃�",
     "Name": "50063",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-24.85,0.01,-25.2|-24.85,0.01,-6|-26.65,0.01,-6|-26.65,0.01,-25.2",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -836,7 +836,7 @@
     "Note": "6-2鐝搷鍦轰綅缃�",
     "Name": "50064",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "-23.09,0.01,-44.84|-26.53,0.01,-44.84|-26.53,0.01,-30.3|-23.09,0.01,-30.3",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -849,7 +849,7 @@
     "Note": "6-3鐝搷鍦轰綅缃�",
     "Name": "50065",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "26.16,0.01,-60.74|26.16,0.01,-64|9.135,0.01,-64|9.135,0.01,-60.74",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -862,7 +862,7 @@
     "Note": "6-4鐝搷鍦轰綅缃�",
     "Name": "50066",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "0.88,0.01,-60.74|0.88,0.01,-64|-16.9,0.01,-64|-16.9,0.01,-60.74",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -875,7 +875,7 @@
     "Note": "6-5鐝搷鍦轰綅缃�",
     "Name": "50067",
     "Scene": "9003",
-    "Range": "-1.1,0.04,17.17|-1.2,0.03,9.83|-14.84,0.03,9.96|-14.84,0.03,17.02",
+    "Range": "23.86,0.01,-46.08|23.86,0.01,-30.12|31.5,0.01,-30.12|31.5,0.01,-46.08",
     "NpcRatio": "-1",
     "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
@@ -942,7 +942,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,7.88,0.21,-41.28",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -955,7 +955,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,7.88,3.45,-41.28",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -968,7 +968,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,7.94,6.69,-36.68",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -981,7 +981,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,7.88,6.69,-41.28",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -994,7 +994,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,7.88,9.93,-41.28",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -1007,7 +1007,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,7.88,13.17,-41.28",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -1020,7 +1020,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,8.76,0.21,-38.35",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -1033,7 +1033,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,7.94,6.69,-21.09",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -1059,7 +1059,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,8.19,9.93,-38.55",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
@@ -1072,7 +1072,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.3,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1085,7 +1085,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.3,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1098,7 +1098,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.3,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1111,7 +1111,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.4,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1124,7 +1124,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.4,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1137,7 +1137,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.04,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1150,7 +1150,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.04,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1163,7 +1163,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.04,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1176,7 +1176,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.04,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1189,7 +1189,7 @@
     "Scene": "9003",
     "Range": "21.93,6.69,-10.4|21.88,6.69,-4.03|15.81,6.69,-4.04|15.9,6.69,-10.3",
     "NpcRatio": "2001,6,6001,0,0.04,0",
-    "PlayerSpawnPoint": "",
+    "PlayerSpawnPoint": "-1",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "-1",
@@ -1202,7 +1202,7 @@
     "Scene": "9003",
     "Range": "-1",
     "NpcRatio": "-1",
-    "PlayerSpawnPoint": "1,18.37,6.69,-4.39",
+    "PlayerSpawnPoint": "1.2,8.15,3.45,-38.21",
     "Oversee": "-1",
     "EndPoint": "-1",
     "RoleLimit": "2001,1,8008,-1|2001,2,8008,-1|2001,6,8008,-1|2001,6,8006,-1|2001,1,8004,-1|2001,2,8004,-1|2001,6,8004,-1|2001,6,8010,-1",
diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity
index 993c3a6d..1205ec47 100644
--- a/xiaofang/Assets/Scenes/Schedule_03.unity
+++ b/xiaofang/Assets/Scenes/Schedule_03.unity
@@ -1684,6 +1684,10 @@ PrefabInstance:
       propertyPath: m_SizeDelta.x
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 7187413038405322106, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3}
+      propertyPath: panel
+      value: 
+      objectReference: {fileID: 618256462}
     - target: {fileID: 7187413038405322106, guid: 26d5710936f5f7d468eb5eb9da96112e, type: 3}
       propertyPath: dataText
       value: 
diff --git a/xiaofang/Assets/Scenes/loginscene.unity b/xiaofang/Assets/Scenes/loginscene.unity
index 8fe0da7e..35a3fdc9 100644
--- a/xiaofang/Assets/Scenes/loginscene.unity
+++ b/xiaofang/Assets/Scenes/loginscene.unity
@@ -385,7 +385,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 488, y: -278.8}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 640, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &131408495
 CanvasRenderer:
@@ -494,7 +494,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 488, y: -498.8}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 300, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &142787312
 MonoBehaviour:
diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
index ebb03b9a..13388e1a 100644
--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@@ -533,7 +533,7 @@ public class Panel : MonoBehaviour
                 isSceneSelected = false;
 
                 // 上传数据
-                UploadData(selectedInfo.peopleId, selectedInfo.dutyId.ToString(), selectedInfo.sceneId.ToString());
+                //UploadData(selectedInfo.peopleId, selectedInfo.dutyId.ToString(), selectedInfo.sceneId.ToString());
 
                 // 更新已添加人员的显示颜色
                 UpdatePeopleListVisual();
@@ -807,7 +807,7 @@ public class Panel : MonoBehaviour
     }
 
     //上传人员数据
-    public void UploadData(string userId,string roleId,string areaId)
+    public void UploadData()
     {
         createTemplateInfo.Instance.auth_CreateTemplate.playerList = new List<PlayerList>();
         foreach (var peopleItem in sceneDataDictionary)
@@ -815,10 +815,10 @@ public class Panel : MonoBehaviour
             foreach (var peopleInfo in peopleItem.Value)
             {
                 PlayerList playerList = new PlayerList();
-                playerList.userId = userId;
-                playerList.roleId = roleId;
-                playerList.birthAreaId = areaId;
-                playerList.chargeAreaId = areaId;
+                playerList.userId = peopleInfo.peopleId;
+                playerList.roleId = peopleInfo.dutyId;
+                playerList.birthAreaId = peopleInfo.sceneId;
+                playerList.chargeAreaId = peopleInfo.sceneId;
                 createTemplateInfo.Instance.auth_CreateTemplate.playerList.Add(playerList);
             }
         }
diff --git a/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
index 9a246182..d2f4af31 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
@@ -21,6 +21,7 @@ public class DatePanel : MonoBehaviour
     public Text inputText;
     public Text dataText;
     public int placeId;
+    public Panel panel;
     public createTemplateInterface createTemplateInterface=new createTemplateInterface();
     // Start is called before the first frame update
     void Start()
@@ -56,6 +57,7 @@ public class DatePanel : MonoBehaviour
         {
             createTemplateInfo.Instance.auth_CreateTemplate.isTemplate = "1";
         }
+        panel.UploadData();
         createTemplateInterface.createTemplate(dataText.text);
     }
 

From bba48a5f2562e2b320b39a534fb48d4e1c552850 Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Wed, 18 Dec 2024 10:24:23 +0800
Subject: [PATCH 3/5] =?UTF-8?q?LogError=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Script/Scheduled_03/Panel.cs         | 2 +-
 xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
index 13388e1a..6c2e8c28 100644
--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@@ -788,7 +788,7 @@ public class Panel : MonoBehaviour
             Text personText = personItem.GetComponentInChildren<Text>();
 
             if (personText != null)
-            {Debug.LogError("INININNIININININININININININININININININININI");
+            {
                 // 检查该人员是否已经添加到当前场景
                 bool isPersonAdded = sceneDataDictionary[selectedInfo.scene].Any(info => info.name == personText.text);
 
diff --git a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
index d643d8cc..3a0cc0dc 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
@@ -81,7 +81,6 @@ public class EvacuationPanel : MonoBehaviour
         createTemplateInfo.Instance.auth_CreateTemplate.npcList = new List<NpcList>();
         foreach(var npcInfo in personnelItems)
         {
-            Debug.LogError("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
             NpcList nPC = new NpcList();
             nPC.npcId = npcInfo.npcId.ToString();
             nPC.areaId = npcInfo.sceneId.ToString();

From 9770a94f2bd725c655d2b51a49f484436b47d524 Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Wed, 18 Dec 2024 11:16:15 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=83=A8=E5=88=86json=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8Cnpc=E5=85=A5=E5=8F=82=E6=95=B0=E6=8D=AE=E5=90=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/JsonAsset/GlobalJson.json       | 1320 ++++++++---------
 .../Resources/JsonAsset/IncidentSite .json    |   30 +-
 .../Assets/Resources/JsonAsset/Matial.json    |  561 +++----
 .../DirllInterface/createTemplateInterface.cs |    2 +-
 .../Assets/Script/UI/PanelUI/DatePanel.cs     |    1 +
 .../Script/UI/PanelUI/EvacuationPanel.cs      |    4 +-
 6 files changed, 956 insertions(+), 962 deletions(-)

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": "鍚勬ゼ灞傛暀瀹よ�佸笀鏀跺埌鐨勭枏鏁ｉ『搴忔彁绀烘枃鏈琁D",
-        "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": "鐖嗙噧浜嬩欢鍙戠敓鏃秞x绫宠寖鍥村唴鐨勮鑹茶礋浼�/鏄忚糠",
-        "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绉掑悗锛屾儕棰ょ姸鎬佹寔缁瓂y绉掔殑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": "鍚勬ゼ灞傛暀瀹よ�佸笀鏀跺埌鐨勭枏鏁ｉ『搴忔彁绀烘枃鏈琁D",
+    "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": "鐖嗙噧浜嬩欢鍙戠敓鏃秞x绫宠寖鍥村唴鐨勮鑹茶礋浼�/鏄忚糠",
+    "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绉掑悗锛屾儕棰ょ姸鎬佹寔缁瓂y绉掔殑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}");
             }
         }
     }

From bd16418df53e8cc901a5890468117dbc1784b35d Mon Sep 17 00:00:00 2001
From: huyulong <1838407198@qq.com>
Date: Wed, 18 Dec 2024 11:17:37 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Scenes/Tmap 1.unity           | 98 +++++++++----------
 xiaofang/Assets/Scenes/sucai01.unity          | 84 +++++++++++++++-
 .../Assets/Script/Character/CameraControl.cs  |  2 +-
 .../Script/hylScripts/CameraSmoothMove.cs     | 29 ++++++
 .../hylScripts/CameraSmoothMove.cs.meta       | 11 +++
 5 files changed, 171 insertions(+), 53 deletions(-)
 create mode 100644 xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs
 create mode 100644 xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs.meta

diff --git a/xiaofang/Assets/Scenes/Tmap 1.unity b/xiaofang/Assets/Scenes/Tmap 1.unity
index 211e5cbb..ce715b83 100644
--- a/xiaofang/Assets/Scenes/Tmap 1.unity	
+++ b/xiaofang/Assets/Scenes/Tmap 1.unity	
@@ -13470,7 +13470,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1068997304}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -10.07, y: 3.58, z: -2.05}
+  m_LocalPosition: {x: -6.82, y: 1.67, z: 2}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -13490,8 +13490,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Character: {fileID: 382802812}
-  pivotOffset: {x: 0, y: 1.7, z: 0}
-  camOffset: {x: 0.2, y: 0.2, z: -1}
+  pivotOffset: {x: 0, y: 1.6, z: 0}
+  camOffset: {x: 0.2, y: 0, z: -1}
   smooth: 10
   horizontalAimingSpeed: 6
   verticalAimingSpeed: 6
@@ -14135,6 +14135,52 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 454008, guid: c9aa675884b75594b9a1c43c5c4e5c7a, type: 3}
   m_PrefabInstance: {fileID: 1108412769}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &1108700887
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1108700889}
+  - component: {fileID: 1108700888}
+  m_Layer: 0
+  m_Name: BurstCollisionWorld
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1108700888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1108700887}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  cellSpans:
+    m_AlignBytes: 16
+--- !u!4 &1108700889
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1108700887}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 36
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1111438060
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -29844,52 +29890,6 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 410985242629440748, guid: 9263a339010a182478c1a809e3f8ddf1, type: 3}
   m_PrefabInstance: {fileID: 2025302170}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &2026547709
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2026547711}
-  - component: {fileID: 2026547710}
-  m_Layer: 0
-  m_Name: BurstCollisionWorld
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &2026547710
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2026547709}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f1a161c4294214a4fbcb7e9e94800494, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  cellSpans:
-    m_AlignBytes: 16
---- !u!4 &2026547711
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2026547709}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 36
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &2029521438
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/xiaofang/Assets/Scenes/sucai01.unity b/xiaofang/Assets/Scenes/sucai01.unity
index da51aea7..c0a10ced 100644
--- a/xiaofang/Assets/Scenes/sucai01.unity
+++ b/xiaofang/Assets/Scenes/sucai01.unity
@@ -2463,6 +2463,37 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 84f9f2b18f8aceb44801fc2ec7ce8f01, type: 3}
+--- !u!1 &588795342
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 588795343}
+  m_Layer: 0
+  m_Name: 1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &588795343
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 588795342}
+  m_LocalRotation: {x: 0, y: 0.70041114, z: 0, w: 0.71373963}
+  m_LocalPosition: {x: 0, y: 1, z: 29.33}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 176
+  m_LocalEulerAnglesHint: {x: 0, y: 88.92, z: 0}
 --- !u!1001 &593180007
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -6531,6 +6562,37 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 335b92d98d9b99a40931188cdcf39c39, type: 3}
+--- !u!1 &1425267833
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1425267834}
+  m_Layer: 0
+  m_Name: 2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1425267834
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1425267833}
+  m_LocalRotation: {x: 0, y: 0.70041114, z: 0, w: 0.71373963}
+  m_LocalPosition: {x: 0.94, y: 1, z: -20.55}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 177
+  m_LocalEulerAnglesHint: {x: 0, y: 88.92, z: 0}
 --- !u!1001 &1425943035
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9239,6 +9301,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1888493524}
+  - component: {fileID: 1888493525}
   - component: {fileID: 1888493523}
   - component: {fileID: 1888493522}
   m_Layer: 0
@@ -9306,14 +9369,29 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1888493521}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
+  m_LocalRotation: {x: 0, y: 0.70041114, z: 0, w: 0.71373963}
+  m_LocalPosition: {x: 0, y: 1, z: 29.33}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 88.92, z: 0}
+--- !u!114 &1888493525
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1888493521}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 276124c99c246e840b4970f38c67029e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  startPoint: {fileID: 588795343}
+  endPoint: {fileID: 1425267834}
+  duration: 5
 --- !u!1001 &1922936381
 PrefabInstance:
   m_ObjectHideFlags: 0
diff --git a/xiaofang/Assets/Script/Character/CameraControl.cs b/xiaofang/Assets/Script/Character/CameraControl.cs
index 2ff4de2a..187257d1 100644
--- a/xiaofang/Assets/Script/Character/CameraControl.cs
+++ b/xiaofang/Assets/Script/Character/CameraControl.cs
@@ -6,7 +6,7 @@ public class CameraControl : MonoBehaviour
 {
     public Transform Character;                                           // 玩家的引用。
     public Vector3 pivotOffset = new Vector3(0.0f, 1.7f, 0.0f);       // 相机相对于玩家的偏移量，用于调整相机的中心点。
-    public Vector3 camOffset = new Vector3(0.2f, 0.2f, -1f);       // 相机相对于玩家位置的偏移量，用于定位相机。
+    public Vector3 camOffset = new Vector3(0.2f, 0.2f, -1f);            // 相机相对于玩家位置的偏移量，用于定位相机。
     public float smooth = 10f;                                         // 相机响应的平滑速度。
     public float horizontalAimingSpeed = 6f;                           // 水平转动速度。
     public float verticalAimingSpeed = 6f;                             // 垂直转动速度。
diff --git a/xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs b/xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs
new file mode 100644
index 00000000..db51e958
--- /dev/null
+++ b/xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs
@@ -0,0 +1,29 @@
+ using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class CameraSmoothMove : MonoBehaviour
+{
+
+    public Transform startPoint;  // 起始点
+    public Transform endPoint;    // 终点
+    public float duration = 5f;   // 移动所需的时间（秒）
+
+    private float elapsedTime = 0f;  // 记录已经过去的时间
+
+    void Update()
+    {
+        // 确保起始点和终点存在
+        if (startPoint != null && endPoint != null)
+        {
+            // 更新经过的时间
+            elapsedTime += Time.deltaTime;
+
+            // 计算摄像机的位置：根据时间比例计算当前位置
+            float t = Mathf.Clamp01(elapsedTime / duration);
+
+            // 使用 Lerp 平滑过渡摄像机的位置
+            transform.position = Vector3.Lerp(startPoint.position, endPoint.position, t);
+        }
+    }
+}
diff --git a/xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs.meta b/xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs.meta
new file mode 100644
index 00000000..fbb773ed
--- /dev/null
+++ b/xiaofang/Assets/Script/hylScripts/CameraSmoothMove.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 276124c99c246e840b4970f38c67029e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: