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:
huyulong 2024-12-09 15:35:44 +08:00
commit d5ad76e1d6
4 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xiaofang/Assets/Script/Scheduled_03/Panel.cs
View File

@ -96,7 +96,7 @@ public class Panel : MonoBehaviour
for (int i = 1; i < panelToggle.Length; i++) for (int i = 1; i < panelToggle.Length; i++)
{ {
panelToggle[i].interactable = false; panelToggle[i].interactable = false;
//panelToggle[i].gameObject. panelToggle[i].gameObject.transform.GetComponent<Image>().sprite = toggleImage[0];
} }
} }
@ -367,7 +367,9 @@ public class Panel : MonoBehaviour
if(selectScenePanel.isSure) if(selectScenePanel.isSure)
{ {
panelToggle[1].interactable = selectScenePanel.isSure; // 启用第二个Toggle panelToggle[1].interactable = selectScenePanel.isSure; // 启用第二个Toggle
panelToggle[1].gameObject.transform.GetComponent<Image>().sprite = toggleImage[1];
panelToggle[2].interactable = selectScenePanel.isSure; // 启用第三个Toggle panelToggle[2].interactable = selectScenePanel.isSure; // 启用第三个Toggle
panelToggle[2].gameObject.transform.GetComponent<Image>().sprite = toggleImage[1];
panelToggle[3].interactable = selectScenePanel.isSure; // 启用第二个Toggle panelToggle[3].interactable = selectScenePanel.isSure; // 启用第二个Toggle
panelToggle[4].interactable = selectScenePanel.isSure; // 启用第三个Toggle panelToggle[4].interactable = selectScenePanel.isSure; // 启用第三个Toggle
} }

4
xiaofang/Assets/Script/UI/PanelUI/DatePanel.cs
View File

@ -1,3 +1,4 @@
using JetBrains.Annotations;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using TMPro; using TMPro;
@ -19,6 +20,7 @@ public class DatePanel : MonoBehaviour
public Text submitText; public Text submitText;
public Text inputText; public Text inputText;
public Text dataText; public Text dataText;
public int placeId;
// Start is called before the first frame update // Start is called before the first frame update
void Start() void Start()
{ {
@ -44,7 +46,7 @@ public class DatePanel : MonoBehaviour
//Ìá½»°´Å¥ //Ìá½»°´Å¥
public void OnClickSubmitPanel() public void OnClickSubmitPanel()
{ {
createTemplateInfo.Instance.auth_CreateTemplate.subjectId = PlaceText.text; createTemplateInfo.Instance.auth_CreateTemplate.subjectId = placeId.ToString();
if (preservationToggle.isOn==true) if (preservationToggle.isOn==true)
{ {
submitPanel.gameObject.SetActive(true); submitPanel.gameObject.SetActive(true);

19
xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
View File

@ -59,19 +59,12 @@ public class EvacuationPanel : MonoBehaviour
public void totalSubmit() public void totalSubmit()
{ {
Debug.Log("----------------->>>>>>>>>>>" + createTemplateInfo.Instance.auth_CreateTemplate.npcList==null); Debug.Log(createTemplateInfo.Instance.auth_CreateTemplate + "===============");
foreach(var item in createTemplateInfo.Instance.auth_CreateTemplate.npcList) NpcList nPC = new NpcList();
{ nPC.userId = npcType;
item.userId = npcType; nPC.roleId = roleid;
item.roleId = roleid; createTemplateInfo.Instance.auth_CreateTemplate.npcList = new List<NpcList>();
} createTemplateInfo.Instance.auth_CreateTemplate.npcList.Add(nPC);
foreach(var item in createTemplateInfo.Instance.auth_CreateTemplate.playerList)
{
}
} }
public void SetNpcType() public void SetNpcType()

3
xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs
View File

@ -182,6 +182,8 @@ public class SelectScenePanel : MonoBehaviour
if (isSelected) if (isSelected)
{ {
this.idcidentName = item.incidentText.text; this.idcidentName = item.incidentText.text;
this.idcidentId = item.incidentID;
datePanel.placeId = item.incidentID;
string[] difficulty = eventData.Value.Difficulty.Split('|'); string[] difficulty = eventData.Value.Difficulty.Split('|');
// È·±£difficultyListºÍdifficultyµÄ³¤¶ÈÆ¥Åä // È·±£difficultyListºÍdifficultyµÄ³¤¶ÈÆ¥Åä
@ -264,7 +266,6 @@ public class SelectScenePanel : MonoBehaviour
EventData eventData = jsonReader.GetEvenById(this.eventId); EventData eventData = jsonReader.GetEvenById(this.eventId);
foreach (string disasterLocation in incidentIds2) foreach (string disasterLocation in incidentIds2)
{ {
//Debug.Log("disasterLocation>>>>>>>"+ disasterLocation);
InstantiateIncidentPrefab(int.Parse(disasterLocation)); InstantiateIncidentPrefab(int.Parse(disasterLocation));
OnRandomEventClick(); OnRandomEventClick();
} }