wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

Browse Source
This commit is contained in:
林小智丶 2024-12-27 12:01:23 +08:00
commit 01873bd34c
3 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xiaofang/Assets/Resources/JsonAsset/Area.json
View File

@ -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"

2
xiaofang/Assets/Scenes/Schedule_03.unity
View File

@ -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

26
xiaofang/Assets/yhj/scripts/JueseChoicePop.cs
View File

@ -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<ClassMate>();
Button button = item.GetComponent<Button>();
//button.onClick.AddListener(() =>
//{
button.onClick.AddListener(() =>
{
// SetClassMate(classMate, scnenName);
//});
});
classMate.name = info.name;
classMate.classmatename.text = classMate.name;
//classMate.id = info.dutyId;
@ -98,6 +101,10 @@ public class JueseChoicePop : MonoBehaviour
}
}
}
if(panel.sceneDataDictionary.Count==0)
{
WarningPopPanel.OpenPanel("请先添加对应的应急人员配置");
}
}
//点击人员后设置位置的方法
public void SetClassMate(ClassMate classMate, string a = "")
@ -111,4 +118,13 @@ public class JueseChoicePop : MonoBehaviour
{
this.classItem = classItem;
}
//关闭界面的时候删除子物体
public void ClearAll()
{
foreach(Transform child in content)
{
Destroy(child.gameObject);
}
}
}