diff --git a/xiaofang/Assets/Resources/JsonAsset/Area.json b/xiaofang/Assets/Resources/JsonAsset/Area.json index 2eefaea7..36dd0ff1 100644 --- a/xiaofang/Assets/Resources/JsonAsset/Area.json +++ b/xiaofang/Assets/Resources/JsonAsset/Area.json @@ -1089,7 +1089,7 @@ "PlayerSpawnPoint": "1.2,7.88,0.21,-41.28", "LabelPos": "7.88,0.21,-41.28", "ShowRadius": "38", - "Oversee": "-1", + "Oversee": "8010,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", "Level": "1,20042" @@ -1104,7 +1104,7 @@ "PlayerSpawnPoint": "1.2,7.88,3.45,-41.28", "LabelPos": "7.88,3.45,-41.28", "ShowRadius": "38", - "Oversee": "-1", + "Oversee": "8010,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", "Level": "2,20043" @@ -1119,7 +1119,7 @@ "PlayerSpawnPoint": "1.2,7.94,6.69,-36.68", "LabelPos": "7.94,6.69,-36.68", "ShowRadius": "38", - "Oversee": "-1", + "Oversee": "8010,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", "Level": "3,20044" @@ -1134,7 +1134,7 @@ "PlayerSpawnPoint": "1.2,7.88,6.69,-41.28", "LabelPos": "7.88,6.69,-41.28", "ShowRadius": "38", - "Oversee": "-1", + "Oversee": "8010,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", "Level": "3,20044" @@ -1149,7 +1149,7 @@ "PlayerSpawnPoint": "1.2,7.88,9.93,-41.28", "LabelPos": "7.88,9.93,-41.28", "ShowRadius": "38", - "Oversee": "-1", + "Oversee": "8010,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", "Level": "4,20045" @@ -1164,7 +1164,7 @@ "PlayerSpawnPoint": "1.2,7.88,13.17,-41.28", "LabelPos": "7.88,13.17,-41.28", "ShowRadius": "38", - "Oversee": "-1", + "Oversee": "8010,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", "Level": "5,20046" diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity index 416d0898..e1329c19 100644 --- a/xiaofang/Assets/Scenes/Schedule_03.unity +++ b/xiaofang/Assets/Scenes/Schedule_03.unity @@ -11492,7 +11492,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 9196293257107006892, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9196293257107006895, guid: 86668fbe8407a8741bb903177bc93fdb, type: 3} propertyPath: panel diff --git a/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs b/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs index 8e4425fc..a889c7ab 100644 --- a/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs +++ b/xiaofang/Assets/yhj/scripts/JueseChoicePop.cs @@ -24,6 +24,7 @@ public class JueseChoicePop : MonoBehaviour public string s; public JSONReader jsonReader; public Panel panel; + public WarningPopPanel WarningPopPanel; //Start is called before the first frame update void Start() { @@ -39,6 +40,7 @@ public class JueseChoicePop : MonoBehaviour } void CLosePop() { + ClearAll(); this.gameObject.SetActive(false); } public void openPop() @@ -67,7 +69,8 @@ public class JueseChoicePop : MonoBehaviour foreach(var all in panel.sceneDataDictionary) { foreach (var info in all.Value) - {Debug.LogError("-------------------------"+ info.sceneId); + { + Debug.LogError("-------------------------"+ info.sceneId); LocationData locationData = jsonReader.GetAreaDateById(int.Parse(info.sceneId)); if (locationData.Oversee == "-1") { @@ -77,7 +80,7 @@ public class JueseChoicePop : MonoBehaviour string[] overseeParts = locationData.Oversee.Split(','); string firstElement = overseeParts[0]; string lastElement = overseeParts[1]; - + if (overseeParts.Length > 0) { @@ -86,10 +89,10 @@ public class JueseChoicePop : MonoBehaviour GameObject item = GameObject.Instantiate(classmatePrefab, content); ClassMate classMate = item.GetComponent(); Button button = item.GetComponent