From 134eeda58ded80c57cb0e7577ba041fd03c6f464 Mon Sep 17 00:00:00 2001 From: lq <3298408835@qq.com> Date: Mon, 23 Dec 2024 16:02:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8F=8AJson?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../itemPrefabs/personnelSceneitem.prefab | 22 +- xiaofang/Assets/Resources/JsonAsset/Area.json | 288 +++++++++++++++--- .../Assets/Resources/JsonAsset/Language.json | 182 ++++++++++- xiaofang/Assets/Scenes/Schedule_03.unity | 28 +- .../Assets/Script/JSONReader/JSONReader.cs | 5 + .../Script/UI/PanelUI/DistributionPanel.cs | 1 + .../Script/UI/PanelUI/EvacuationPanel.cs | 11 - xiaofang/Assets/yhj/scripts/JueseChoicePop.cs | 6 - 8 files changed, 463 insertions(+), 80 deletions(-) diff --git a/xiaofang/Assets/Prefabs/itemPrefabs/personnelSceneitem.prefab b/xiaofang/Assets/Prefabs/itemPrefabs/personnelSceneitem.prefab index 8f661c2d..c55b30b8 100644 --- a/xiaofang/Assets/Prefabs/itemPrefabs/personnelSceneitem.prefab +++ b/xiaofang/Assets/Prefabs/itemPrefabs/personnelSceneitem.prefab @@ -30,13 +30,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7531194149634478661} - m_RootOrder: 0 + m_Father: {fileID: 5900002970331946163} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 779.9408, y: 21} - m_SizeDelta: {x: 467.2219, y: 42} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 520, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7577960020006578146 CanvasRenderer: @@ -268,6 +268,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 5900002970044280994} + - {fileID: 8838300892937481870} - {fileID: 7531194149634478661} - {fileID: 5900002970821547561} m_Father: {fileID: 5900002971020626570} @@ -453,7 +454,7 @@ RectTransform: m_Children: - {fileID: 5900002969924403204} m_Father: {fileID: 5900002970331946163} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -814,15 +815,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 8838300892937481870} + m_Children: [] m_Father: {fileID: 5900002970331946163} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 520.5148, y: 0} + m_SizeDelta: {x: 520, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6555106214558057608 CanvasRenderer: diff --git a/xiaofang/Assets/Resources/JsonAsset/Area.json b/xiaofang/Assets/Resources/JsonAsset/Area.json index 0499dcc1..30ddacdf 100644 --- a/xiaofang/Assets/Resources/JsonAsset/Area.json +++ b/xiaofang/Assets/Resources/JsonAsset/Area.json @@ -7,6 +7,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1,19.34,0.21,8.86|1,18.85,0.21,0.76", + "LabelPos": "19.34,0.21,8.86", + "ShowRadius": "38", "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", @@ -20,6 +22,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1,8.99,3.45,-25.51", + "LabelPos": "8.99,3.45,-25.51", + "ShowRadius": "38", "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", @@ -33,6 +37,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1,-14.54,0.21,23.57", + "LabelPos": "-14.54,0.21,23.57", + "ShowRadius": "38", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "2001,1,8002,1|2001,2,8002,1|2001,6,8002,1", @@ -46,6 +52,8 @@ "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": "2,0,0.17,0|1.5,-18.11,0.17,-13.1|1,-17.55,0.17,11.44", + "LabelPos": "0,0.17,0", + "ShowRadius": "38", "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,9 +64,11 @@ "Note": "1号楼道", "Name": "50004", "Scene": "9003", - "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", + "Range": "14.67,13.17,20.53|22.62,11.79,20.53|22.62,11.79,18.9|14.33,9.93,18.9|14.33,9.93,20.53|22.62,8.55,20.53|22.62,8.55,18.9|14.33,6.69,18.9|14.33,6.69,20.53|22.62,5.29,20.53|22.62,5.29,18.9|14.33,3.45,18.9|14.33,3.45,20.53|22.62,1.89,20.53|22.62,1.89,18.9|14.76,0.21,17.74|14.76,0.21,20.53|15.74,0.21,20.53|15.74,0.21,18.9|20.85,1.89,18.9|20.85,1.89,19.32|14.94,3.45,19.32|14.94,3.45,18.9|20.85,5.29,18.9|20.85,5.29,19.32|14.94,6.69,19.32|14.94,6.69,18.9|20.85,8.55,18.9|20.85,8.55,19.32|14.94,9.93,19.32|14.94,9.93,18.9|20.85,11.79,18.9|20.85,11.79,19.32|14.67,13.17,19.32", "NpcRatio": "2001,6,6001,0,1.28,0", "PlayerSpawnPoint": "-1", + "LabelPos": "21.82,1.31,19.05", + "ShowRadius": "38", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -69,9 +79,11 @@ "Note": "2号楼道", "Name": "50005", "Scene": "9003", - "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", + "Range": "15.04,0.21,-47.69|22.6,1.89,-47.69|22.6,1.89,-45.16|14.14,3.45,-45.16|14.14,3.45,-47.69|22.6,5.29,-47.69|22.6,5.29,-45.16|13.79,6.69,-45.16|13.79,6.69,-47.69|22.59,8.55,-47.69|22.59,8.55,-45.16|13.92,9.93,-45.16|13.92,9.93,-47.69|22.59,11.79,-47.69|22.59,11.79,-45.16|14.74,13.17,-45.16|14.74,13.17,-46.31|20.81,11.79,-46.16|20.81,11.79,-46.37|14.96,9.93,-46.37|14.96,9.93,-46.16|20.81,8.55,-46.16|20.81,8.55,-46.37|14.96,6.69,-46.37|14.96,6.69,-46.16|20.81,5.29,-46.16|20.81,5.29,-46.37|14.96,3.45,-46.37|14.96,3.45,-46.16|20.81,1.89,-46.16|20.81,1.89,-46.37|15.04,0.21,-46.53", "NpcRatio": "2001,6,6001,0,1.28,0", "PlayerSpawnPoint": "-1", + "LabelPos": "21.75,1.31,-46.45", + "ShowRadius": "38", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -85,6 +97,8 @@ "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", + "LabelPos": "-21.5,1.31,-58.8", + "ShowRadius": "38", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -98,6 +112,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "0.6,6.08,0.2,-48.65", + "LabelPos": "6.08,0.2,-48.65", + "ShowRadius": "38", "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", @@ -108,9 +124,11 @@ "Note": "1-1班", "Name": "50008", "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": "-8.55,0.21,-51.01|-8.55,0.21,-58.11|-14.91,0.21,-58.11|-14.91,0.21,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,-7.62,0.21,-54.14", + "LabelPos": "-7.62,0.21,-54.14", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1042", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -121,9 +139,11 @@ "Note": "1-2班", "Name": "50009", "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": "-0.07,0.21,-51.01|-0.07,0.21,-58.11|-6.44,0.21,-58.11|-6.44,0.21,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,0.79,0.21,-54.84", + "LabelPos": "0.79,0.21,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1043", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -134,9 +154,11 @@ "Note": "1-3班", "Name": "50010", "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": "8.18,0.21,-51.02|8.18,0.21,-58.11|1.99,0.21,-58.11|1.99,0.21,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,9.26,0.21,-54.84", + "LabelPos": "9.26,0.21,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1044", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -147,9 +169,11 @@ "Note": "1-4班", "Name": "50011", "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": "16.66,0.21,-51.02|16.66,0.21,-58.11|10.47,0.21,-58.11|10.47,0.21,-51.12", "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,17.73,0.21,-54.84", + "LabelPos": "17.73,0.21,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1045", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -163,6 +187,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -173,9 +199,11 @@ "Note": "2-1班", "Name": "50013", "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": "-8.73,3.45,-51.02|-8.73,3.45,-58.11|-14.93,3.45,-58.11|-14.93,3.45,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,-7.62,3.45,-54.14", + "LabelPos": "-7.62,3.45,-54.14", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1047", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -186,9 +214,11 @@ "Note": "2-2班", "Name": "50014", "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": "-0.25,3.45,-51.02|-0.25,3.45,-58.11|-6.45,3.45,-58.11|-6.45,3.45,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,0.79,3.45,-54.84", + "LabelPos": "0.79,3.45,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1048", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -199,9 +229,11 @@ "Note": "2-3班", "Name": "50015", "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": "8.19,3.45,-51.02|8.19,3.45,-58.11|2,3.45,-58.11|2,3.45,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,9.26,3.45,-54.84", + "LabelPos": "9.26,3.45,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1049", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -212,9 +244,11 @@ "Note": "2-4班", "Name": "50016", "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": "16.68,3.45,-51.02|16.68,3.45,-58.11|10.48,3.45,-58.11|10.48,3.45,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,17.73,3.45,-54.84", + "LabelPos": "17.73,3.45,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1050", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -225,9 +259,11 @@ "Note": "2-5班", "Name": "50017", "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": "25.16,6.73,-51.02|25.16,6.73,-58.11|18.96,6.73,-58.11|18.96,6.73,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", - "PlayerSpawnPoint": "1,26.18,6.73,-54.842", + "PlayerSpawnPoint": "1,26.18,6.73,-54.84", + "LabelPos": "26.18,6.73,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1051", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -238,9 +274,11 @@ "Note": "3-1班", "Name": "50018", "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": "-0.25,6.73,-51.02|-0.25,6.73,-58.11|-6.45,6.73,-58.11|-6.45,6.73,-51.02", "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,0.79,6.73,-54.84", + "LabelPos": "0.79,6.73,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1052", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -251,9 +289,11 @@ "Note": "3-2班", "Name": "50019", "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": "8.23,6.73,-51.02|8.23,6.73,-58.11|2.04,6.73,-58.11|2.04,6.73,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,9.26,6.73,-54.84", + "LabelPos": "9.26,6.73,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1053", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -264,9 +304,11 @@ "Note": "3-3班", "Name": "50020", "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": "16.68,6.73,-51.02|16.68,6.73,-58.11|10.49,6.73,-58.11|10.49,6.73,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,17.73,6.73,-54.84", + "LabelPos": "17.73,6.73,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1054", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -277,9 +319,11 @@ "Note": "3-4班", "Name": "50021", "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": "25.17,9.95,-51.02|25.17,9.95,-58.11|18.97,9.95,-58.11|18.97,9.95,-51.02", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", - "PlayerSpawnPoint": "1,26.18,9.95,-54.842", + "PlayerSpawnPoint": "1,26.18,9.95,-54.84", + "LabelPos": "26.18,9.95,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1055", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -290,9 +334,11 @@ "Note": "3-5班", "Name": "50022", "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.62,9.93,-38.06|22.62,9.93,-44.74|15.02,9.93,-44.74|15.02,9.93,-38.06", "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,9.95,-36.78", + "LabelPos": "18.37,9.95,-36.78", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1056", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -303,9 +349,11 @@ "Note": "4-1班", "Name": "50023", "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": "-8.35,9.95,-51.01|-8.35,9.95,-58.1|-14.92,9.95,-58.1|-14.92,9.95,-51.01", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,-7.62,9.95,-54.14", + "LabelPos": "-7.62,9.95,-54.14", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1057", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -316,9 +364,11 @@ "Note": "4-2班", "Name": "50024", "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": "0.01,9.95,-51.01|0.01,9.95,-58.1|-6.44,9.95,-58.1|-6.44,9.95,-51.01", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,0.79,9.95,-54.84", + "LabelPos": "0.79,9.95,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1058", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -329,9 +379,11 @@ "Note": "4-3班", "Name": "50025", "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": "8.46,9.95,-51.01|8.46,9.95,-58.1|2.01,9.95,-58.1|2.01,9.95,-51.01", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,9.26,9.95,-54.84", + "LabelPos": "9.26,9.95,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1059", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -342,9 +394,11 @@ "Note": "4-4班", "Name": "50026", "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": "16.94,9.95,-51.01|16.94,9.95,-58.1|10.48,9.95,-58.1|10.48,9.95,-51.01", "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,17.73,9.95,-54.84", + "LabelPos": "17.73,9.95,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1060", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -355,9 +409,11 @@ "Note": "4-5班", "Name": "50027", "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": "25.22,13.17,-51.01|25.22,13.17,-58.1|18.96,13.17,-58.1|18.96,13.17,-51.01", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", - "PlayerSpawnPoint": "1,26.18,13.17,-54.842", + "PlayerSpawnPoint": "1,26.18,13.17,-54.84", + "LabelPos": "26.18,13.17,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1046", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -368,9 +424,11 @@ "Note": "5-1班", "Name": "50028", "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.61,9.93,-30.03|22.61,9.93,-35.6|15.02,9.93,-35.6|15.02,9.93,-30.03", "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,9.93,-28.65", + "LabelPos": "18.37,9.93,-28.65", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1061", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -381,9 +439,11 @@ "Note": "5-2班", "Name": "50029", "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.61,9.93,-21.91|22.61,9.93,27.47|15.02,9.93,-27.47|15.02,9.93,-21.91", "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,9.93,-20.54", + "LabelPos": "18.37,9.93,-20.54", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1062", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -394,9 +454,11 @@ "Note": "5-3班", "Name": "50030", "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.61,9.93,-13.79|22.61,9.93,-19.35|15.02,9.93,-19.35|15.02,9.93,-13.79", "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,9.93,-12.47", + "LabelPos": "18.37,9.93,-12.47", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1063", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -407,9 +469,11 @@ "Note": "5-4班", "Name": "50031", "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.61,9.93,15.17|22.61,9.93,5.04|15.02,9.93,5.04|15.02,9.93,15.17", "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,9.93,16.59", + "LabelPos": "18.37,9.93,16.59", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1064", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -423,6 +487,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -433,9 +499,11 @@ "Note": "6-6班", "Name": "50033", "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.61,13.17,-21.87|22.61,13.17,-27.47|15.02,13.17,-27.47|15.02,13.17,-21.87", "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,13.17,-20.54", + "LabelPos": "18.37,13.17,-20.54", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1066", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -446,9 +514,11 @@ "Note": "6-1班", "Name": "50034", "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": "-8.57,13.17,-51.01|-8.57,13.17,-58.1|-14.9,13.17,-58.1|-14.9,13.17,-51.01", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,-7.62,13.17,-54.14", + "LabelPos": "-7.62,13.17,-54.14", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1067", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -459,9 +529,11 @@ "Note": "6-2班", "Name": "50035", "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": "-0.1,13.17,-51.01|-0.1,13.17,-58.1|-6.43,13.17,-58.1|-6.43,13.17,-51.01", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,0.79,13.17,-54.84", + "LabelPos": "0.79,13.17,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1068", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -472,9 +544,11 @@ "Note": "6-3班", "Name": "50036", "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": "8.37,13.17,-51.01|8.37,13.17,-58.12|2.01,13.17,-58.12|2.01,13.17,-51.01", "NpcRatio": "2001,1,6001,1,3.45,1|2001,2,6001,1,3.45,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,9.26,13.17,-54.84", + "LabelPos": "9.26,13.17,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1069", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -485,9 +559,11 @@ "Note": "6-4班", "Name": "50037", "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": "16.85,13.17,-51.01|16.85,13.17,-58.12|10.49,13.17,-58.12|10.49,13.17,-51.01", "NpcRatio": "2001,1,6001,1,3.44,1|2001,2,6001,1,3.44,1|2001,6,6001,1,2.56,0", "PlayerSpawnPoint": "1,17.73,13.17,-54.84", + "LabelPos": "17.73,13.17,-54.84", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1070", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -498,9 +574,11 @@ "Note": "6-5班", "Name": "50038", "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.62,13.17,-30.07|22.62,13.17,-35.58|15.02,13.17,-35.58|15.02,13.17,-30.07", "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,13.17,-28.65", + "LabelPos": "18.37,13.17,-28.65", + "ShowRadius": "38", "Oversee": "8006,1", "EndPoint": "1071", "RoleLimit": "2001,1,8006,1|2001,2,8006,1", @@ -514,6 +592,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -527,6 +607,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -540,6 +622,8 @@ "Range": "-8,0.01,-44.1|-6,0.01,-44.1|-6,0.01,-27.1|-8,.01,-27.1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -553,6 +637,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -566,6 +652,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -579,6 +667,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -592,6 +682,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -605,6 +697,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -618,6 +712,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -631,6 +727,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -644,6 +742,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -657,6 +757,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -670,6 +772,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -683,6 +787,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -696,6 +802,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -709,6 +817,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -722,6 +832,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -735,6 +847,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -748,6 +862,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -761,6 +877,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -774,6 +892,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -787,6 +907,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -800,6 +922,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -813,6 +937,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -826,6 +952,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -839,6 +967,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -852,6 +982,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -865,6 +997,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -878,6 +1012,8 @@ "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", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -891,6 +1027,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "21.48,-0.37,19.24", + "ShowRadius": "38", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -904,6 +1042,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -917,6 +1057,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -930,6 +1072,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -943,6 +1087,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,7.88,0.21,-41.28", + "LabelPos": "2,7.88,0.21,-41.28", + "ShowRadius": "38", "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", @@ -956,6 +1102,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,7.88,3.45,-41.28", + "LabelPos": "2,7.88,3.45,-41.28", + "ShowRadius": "38", "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", @@ -969,6 +1117,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,7.94,6.69,-36.68", + "LabelPos": "2,7.94,6.69,-36.68", + "ShowRadius": "38", "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", @@ -982,6 +1132,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,7.88,6.69,-41.28", + "LabelPos": "2,7.88,6.69,-41.28", + "ShowRadius": "38", "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", @@ -995,6 +1147,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,7.88,9.93,-41.28", + "LabelPos": "2,7.88,9.93,-41.28", + "ShowRadius": "38", "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", @@ -1008,6 +1162,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,7.88,13.17,-41.28", + "LabelPos": "2,7.88,13.17,-41.28", + "ShowRadius": "38", "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", @@ -1021,6 +1177,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,8.76,0.21,-38.35", + "LabelPos": "2,8.76,0.21,-38.35", + "ShowRadius": "38", "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", @@ -1034,6 +1192,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,7.94,6.69,-21.09", + "LabelPos": "2,7.94,6.69,-21.09", + "ShowRadius": "38", "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", @@ -1047,6 +1207,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1060,6 +1222,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,8.19,9.93,-38.55", + "LabelPos": "2,8.19,9.93,-38.55", + "ShowRadius": "38", "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", @@ -1070,9 +1234,11 @@ "Note": "1楼走廊", "Name": "50082", "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": "12.67,0.21,20.53|14.76,0.21,20.53|14.76,0.21,-48.02|29.07,0.21,-48.02|29.07,0.21,-50.76|-22.5,0.21,-50.76|-22.5,0.21,-48|12.67,0.21,-48", "NpcRatio": "2001,6,6001,0,0.3,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1083,9 +1249,11 @@ "Note": "2楼走廊", "Name": "50083", "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": "29.07,3.5,-48.02|14.76,3.5,-48.02|14.76,3.45,20.53|12.67,3.45,20.53|12.67,3.5,-48.1|-12.96,3.5,-48.01|-12.96,3.5,-29.65|-14.54,3.5,-29.65|-14.54,3.5,-48.1|-22.5,3.5,-48.1|-22.5,3.5,-50.72|29.07,3.5,-50.76", "NpcRatio": "2001,6,6001,0,0.3,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1096,9 +1264,11 @@ "Note": "3楼走廊", "Name": "50084", "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": "29.07,6.74,-48.02|14.76,6.74,-48.02|14.76,6.7,20.53|12.67,6.7,20.53|12.67,6.74,-48.1|-12.96,6.74,-48.01|-12.96,6.74,-29.65|-14.54,6.74,-29.65|-14.54,6.74,-48.1|-22.5,6.74,-48.1|-22.5,6.74,-50.72|29.07,6.74,-50.76", "NpcRatio": "2001,6,6001,0,0.3,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1109,9 +1279,11 @@ "Note": "4楼走廊", "Name": "50085", "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": "29.07,9.95,-48.02|14.76,9.95,-48.02|14.76,9.93,20.53|12.67,9.93,20.53|12.67,9.95,-48.1|-12.96,9.95,-48.01|-12.96,9.95,-29.65|-14.54,9.95,-29.65|-14.54,9.95,-48.1|-22.5,9.95,-48.1|-22.5,9.95,-50.72|29.07,9.95,-50.76", "NpcRatio": "2001,6,6001,0,0.4,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1122,9 +1294,11 @@ "Note": "5楼走廊", "Name": "50086", "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": "29.07,13.17,-48.02|14.76,13.17,-48.02|14.76,13.17,20.53|12.67,13.17,20.53|12.67,13.17,-48.1|-12.96,13.17,-48.01|-12.96,13.17,-29.65|-14.54,13.17,-29.65|-14.54,13.17,-48.1|-22.5,13.17,-48.1|-22.5,13.17,-50.72|29.07,13.17,-50.76", "NpcRatio": "2001,6,6001,0,0.4,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1135,9 +1309,11 @@ "Note": "1楼卫生间", "Name": "50087", "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": "-15.22,0.21,-59.89|-15.22,0.21,-51.29|-19.51,0.21,-51.29|-19.51,0.21,-59.89", "NpcRatio": "2001,6,6001,0,0.04,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1148,9 +1324,11 @@ "Note": "2楼卫生间", "Name": "50088", "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": "-15.22,3.5,-59.89|-15.22,3.5,-51.29|-19.51,3.5,-51.29|-19.51,3.5,-59.89", "NpcRatio": "2001,6,6001,0,0.04,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1161,9 +1339,11 @@ "Note": "3楼卫生间", "Name": "50089", "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": "-15.22,6.73,-59.89|-15.22,6.73,-51.29|-19.51,6.73,-51.29|-19.51,6.73,-59.89", "NpcRatio": "2001,6,6001,0,0.04,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1174,9 +1354,11 @@ "Note": "4楼卫生间", "Name": "50090", "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": "-15.22,9.95,-59.89|-15.22,9.95,-51.29|-19.51,9.95,-51.29|-19.51,9.95,-59.89", "NpcRatio": "2001,6,6001,0,0.04,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1187,9 +1369,11 @@ "Note": "5楼卫生间", "Name": "50091", "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": "-15.22,13.17,-59.89|-15.22,13.17,-51.29|-19.51,13.17,-51.29|-19.51,13.17,-59.89", "NpcRatio": "2001,6,6001,0,0.04,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1203,6 +1387,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "1.2,8.15,3.45,-38.21", + "LabelPos": "2,8.15,3.45,-38.21", + "ShowRadius": "38", "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", @@ -1216,6 +1402,8 @@ "Range": "-1", "NpcRatio": "-1", "PlayerSpawnPoint": "-1", + "LabelPos": "-23.46,-0.46,21.4", + "ShowRadius": "38", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1226,9 +1414,11 @@ "Note": "阶梯教室", "Name": "50100", "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.49,0.93,-47.49|-22.49,0.93,-29.62|-19.66,0.93,-29.62|-17.7,0.25,-29.62|-14.87,0.25,-29.62|-14.87,0.25,-47.49|-17.7,0.25,-47.49|-19.66,0.93,-47.49", "NpcRatio": "2001,6,6001,0,0.3,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1239,9 +1429,11 @@ "Note": "舞蹈室", "Name": "50101", "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.49,3.49,-47.51|-22.49,3.49,-29.63|-14.87,3.49,-29.63|-14.87,3.49,-47.51", "NpcRatio": "2001,6,6001,0,0.2,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", @@ -1252,9 +1444,11 @@ "Note": "图书室", "Name": "50102", "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.49,6.73,-47.51|-22.49,6.73,-29.63|-14.87,6.73,-29.63|-14.87,6.73,-47.51", "NpcRatio": "2001,6,6001,0,0.3,0", "PlayerSpawnPoint": "-1", + "LabelPos": "-1", + "ShowRadius": "-1", "Oversee": "-1", "EndPoint": "-1", "RoleLimit": "-1", diff --git a/xiaofang/Assets/Resources/JsonAsset/Language.json b/xiaofang/Assets/Resources/JsonAsset/Language.json index f1c9ec15..8f94a29f 100644 --- a/xiaofang/Assets/Resources/JsonAsset/Language.json +++ b/xiaofang/Assets/Resources/JsonAsset/Language.json @@ -230,10 +230,15 @@ "Note": "职业名" }, { - "ID": "8999", + "ID": "8998", "Text": "班主任", "Note": "职业名" }, + { + "ID": "8999", + "Text": "现场上报", + "Note": "总指挥选项标题用" + }, { "ID": "40001", "Text": "武侯实验小学", @@ -1614,6 +1619,76 @@ "Text": "保存为模板", "Note": "模板相关-预订演练" }, + { + "ID": "20112", + "Text": "{a1}{a2}职责将被撤消,是否继续?", + "Note": "预订演练" + }, + { + "ID": "20113", + "Text": "请先添加对应的应急人员配置", + "Note": "预订演练" + }, + { + "ID": "20114", + "Text": "喂?那边好像起火了,快点派人过来看看,烟雾不小", + "Note": "主持人" + }, + { + "ID": "20115", + "Text": "{好,马上启动应急预案!", + "Note": "主持人" + }, + { + "ID": "20116", + "Text": "中途停止演练无法生成评估报告,是否停止?", + "Note": "主持人" + }, + { + "ID": "20117", + "Text": "客户端版本过低,请前往更新。", + "Note": "账号登录" + }, + { + "ID": "20118", + "Text": "账号或密码不正确", + "Note": "账号登录" + }, + { + "ID": "20119", + "Text": "演练已开始,无法修改演练配置。", + "Note": "账号登录" + }, + { + "ID": "20120", + "Text": "此操作将取消预定于{a1}进行的云演练,是否继续?", + "Note": "账号登录" + }, + { + "ID": "20121", + "Text": "无法进行预订\\n请前往官网购买/续订相关服务", + "Note": "账号登录" + }, + { + "ID": "20122", + "Text": "网络异常\\n与服务器断开连接", + "Note": "账号登录" + }, + { + "ID": "20123", + "Text": "网络异常或服务器维护中,请稍后再试。", + "Note": "账号登录" + }, + { + "ID": "20124", + "Text": "用时{a1} {a2}疏散完毕", + "Note": "指令行动" + }, + { + "ID": "20125", + "Text": "用时{a1},人员疏散完毕!", + "Note": "主持人收到的弹窗提示-指令行动" + }, { "ID": "13001", "Text": "这条路线会经过被烟雾覆盖的楼道!", @@ -1664,6 +1739,36 @@ "Text": "[{a1}]报告:120急救队伍已到场", "Note": "总指挥事件报告" }, + { + "ID": "14001", + "Text": "[{a1}]{a2}{a3}报告:{a4}有{a5}受伤", + "Note": "总指挥事件报告" + }, + { + "ID": "14002", + "Text": "[{a1}]{a2}{a3}报告:{a4}有伤员待转移", + "Note": "总指挥事件报告" + }, + { + "ID": "14003", + "Text": "[{a1}]{a2}{a3}报告:已切断燃气供应", + "Note": "总指挥事件报告" + }, + { + "ID": "14004", + "Text": "[{a1}]{a2}{a3}报告:已切断电力供应", + "Note": "总指挥事件报告" + }, + { + "ID": "14005", + "Text": "[{a1}]{a2}{a3}报告:{a4}{a5}疏散完毕", + "Note": "总指挥事件报告" + }, + { + "ID": "14006", + "Text": "[{a1}]{a2}{a3}报告:明火已扑灭", + "Note": "总指挥事件报告" + }, { "ID": "15000", "Text": "密码登录", @@ -2019,6 +2124,81 @@ "Text": "将[{a1}]指派给:", "Note": "自由行动" }, + { + "ID": "15071", + "Text": "传达指令中…", + "Note": "自由行动" + }, + { + "ID": "15072", + "Text": "交付", + "Note": "按钮名" + }, + { + "ID": "15073", + "Text": "将{a1}*1丢弃在此处?", + "Note": "文本提示-丢弃道具" + }, + { + "ID": "15074", + "Text": "负重超出上限,无法拾取。", + "Note": "文本提示-拾取道具" + }, + { + "ID": "15075", + "Text": "你无法操作{a1}", + "Note": "文本提示-使用道具" + }, + { + "ID": "15076", + "Text": "穿戴", + "Note": "按钮名" + }, + { + "ID": "15077", + "Text": "穿戴中", + "Note": "按钮名" + }, + { + "ID": "15078", + "Text": "没有防护装备,继续前行可能对身体造成永久性伤害!", + "Note": "自由行动" + }, + { + "ID": "15079", + "Text": "有人员正赶来增援,是否离开并放弃处置?", + "Note": "自由行动" + }, + { + "ID": "15080", + "Text": "没有足够的{a1}", + "Note": "文本提示-物资仓库拿道具" + }, + { + "ID": "15081", + "Text": "负重超过上限,无法带走更多物资。", + "Note": "文本提示-物资仓库拿道具" + }, + { + "ID": "15082", + "Text": "安放伤员中…", + "Note": "自由行动" + }, + { + "ID": "15083", + "Text": "无法进行操作,请等待救援。", + "Note": "文本提示-昏迷中点击屏幕" + }, + { + "ID": "15084", + "Text": "昏迷中……", + "Note": "自由行动" + }, + { + "ID": "15085", + "Text": "用时{a1},明火已被扑灭!", + "Note": "主持人收到的弹窗提示-自由行动" + }, { "ID": "50000", "Text": "厨房", diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity index 0eb4e240..91bee2ac 100644 --- a/xiaofang/Assets/Scenes/Schedule_03.unity +++ b/xiaofang/Assets/Scenes/Schedule_03.unity @@ -4891,7 +4891,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840001719723866, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.x - value: 963.7986 + value: 1462.3234 objectReference: {fileID: 0} - target: {fileID: 1031840001719723866, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y @@ -5171,11 +5171,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1031840002171547072, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_SizeDelta.x - value: 1121 + value: 1609.0444 objectReference: {fileID: 0} - target: {fileID: 1031840002171547072, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.x - value: 560.5 + value: 804.5222 objectReference: {fileID: 0} - target: {fileID: 1031840002171547072, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y @@ -5729,6 +5729,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -17.5 objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_SizeDelta.y + value: 42 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchoredPosition.x + value: 535.6023 + objectReference: {fileID: 0} + - target: {fileID: 2672644105302302717, guid: f7e3ba3643cbe834083789575336030d, type: 3} + propertyPath: m_AnchoredPosition.y + value: -21 + objectReference: {fileID: 0} - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -5743,7 +5763,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.x - value: 546.3399 + value: 1055.6023 objectReference: {fileID: 0} - target: {fileID: 3978082958181212982, guid: f7e3ba3643cbe834083789575336030d, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/xiaofang/Assets/Script/JSONReader/JSONReader.cs b/xiaofang/Assets/Script/JSONReader/JSONReader.cs index 61421113..859c28ad 100644 --- a/xiaofang/Assets/Script/JSONReader/JSONReader.cs +++ b/xiaofang/Assets/Script/JSONReader/JSONReader.cs @@ -499,8 +499,13 @@ public class LocationData public string Note; public int Name; public int Scene; + public string Range; public string NpcRatio; + public string PlayerSpawnPoint; + public string LabelPos; + public string ShowRadius; public string Oversee; + public string EndPoint; public string RoleLimit; public int Level; } diff --git a/xiaofang/Assets/Script/UI/PanelUI/DistributionPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/DistributionPanel.cs index 0f4c5ddd..10817dfa 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/DistributionPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/DistributionPanel.cs @@ -55,6 +55,7 @@ public class DistributionPanel : MonoBehaviour } else { + scenetext.lockText.transform.SetParent(scenetext.lockBg.transform); scenetext.lockBg.SetActive(true); } } diff --git a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs index cb6ae6cc..28bafdba 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs @@ -147,7 +147,6 @@ public class EvacuationPanel : MonoBehaviour { item.SetInfo(kvp.Value.ToString()); // UIʾ item.NpcNum = kvp.Value; // Npc - item.personnelImage.gameObject.SetActive(true); // ʾͼ Debug.Log($"Scene ID: {kvp.Key}, Assigned NPC Count: {kvp.Value}"); } @@ -240,30 +239,20 @@ public class EvacuationPanel : MonoBehaviour // ¼ button.onClick.AddListener(() => { - // ǵǰѡ OnSceneItemClicked(sceneitem, Color.yellow, selectedScene); - - // ѾԱ if (personnelItem.NpcNum > 0) { redistributeBtn.interactable = true; ChangeImage(redistributeBtn.interactable); redistributeBtn.transform.GetComponent().sprite = showImage[1]; - - // ֮ǰļȷֻµ¼ִ redistributeBtn.onClick.RemoveAllListeners(); - - // µļ redistributeBtn.onClick.AddListener(() => { - // ѡԱ RedistributeLogic(personnelItem.sceneId, personnelItem.NpcNum); redistributeBtn.interactable = false; ChangeImage(redistributeBtn.interactable); }); } - - // гµԱUI foreach (Transform child in sceneCount) { Destroy(child.gameObject); diff --git a/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs b/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs index d63dc894..ebce2b2a 100644 --- a/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs +++ b/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs @@ -56,17 +56,14 @@ public class JueseChoicePop : MonoBehaviour { Destroy(child.gameObject); } - // ȡָ ID LocationData LocationData locationData = jsonReader.GetAreaDateById(id); - // ж Oversee ֶ if (locationData.Oversee == "-1") { Debug.Log($"Skipping ID {id}: Oversee is -1."); return; // } - // ָ Oversee ֶ string[] overseeParts = locationData.Oversee.Split(','); string firstElement = overseeParts[0]; @@ -92,13 +89,10 @@ public class JueseChoicePop : MonoBehaviour } } } - public void SetClassItem(ClassItem classItem) { this.classItem = classItem; } - - public void SetClassMate(ClassMate classMate, string a = "") { classMate.isBeSet = true;