diff --git a/xiaofang/Assets/Scenes/Schedule_03.unity b/xiaofang/Assets/Scenes/Schedule_03.unity index 6f97ca4a..a804a3b8 100644 --- a/xiaofang/Assets/Scenes/Schedule_03.unity +++ b/xiaofang/Assets/Scenes/Schedule_03.unity @@ -15479,7 +15479,9 @@ MonoBehaviour: m_EditorClassIdentifier: eventId: 101 eventName: {fileID: 7468736065525718883} - eventimage: {fileID: 0} + eventImage: {fileID: 0} + maskImage: {fileID: 0} + IsOpen: 1 --- !u!114 &7468736064294474853 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15785,7 +15787,9 @@ MonoBehaviour: m_EditorClassIdentifier: eventId: 102 eventName: {fileID: 7468736064069646105} - eventimage: {fileID: 0} + eventImage: {fileID: 0} + maskImage: {fileID: 0} + IsOpen: 1 --- !u!222 &7468736064421981256 CanvasRenderer: m_ObjectHideFlags: 0 @@ -16329,9 +16333,7 @@ MonoBehaviour: schoolInfoList: - {fileID: 7468736064927213727} - {fileID: 7468736064421981270} - eventInfoList: - - {fileID: 7468736064294474852} - - {fileID: 7468736064384987111} + eventInfoList: [] incidentInfos: [] sceneItemList: [] difficultyList: diff --git a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs index d4b0c6ec..6ab971c1 100644 --- a/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs +++ b/xiaofang/Assets/Script/UI/PanelUI/SelectScenePanel.cs @@ -63,7 +63,6 @@ public class SelectScenePanel : MonoBehaviour incidentLable.gameObject.SetActive(false); InstantiateScenePrefab(); InstantiateSchoolPrefab(); - InstantiateIncidentPrefab(2001); SetEventToggleOpenorClose(incidentInfos); continueBtn.onClick.AddListener(OnClickContinueBtn); SetFirstChoise(scenetoggleList); @@ -75,6 +74,10 @@ public class SelectScenePanel : MonoBehaviour void Update() { IsClick(); + if(Input.GetKeyDown(KeyCode.A)) + { + SelectEvnentBtn(); + } } //动态加载场景选择预制体 @@ -152,6 +155,7 @@ public class SelectScenePanel : MonoBehaviour GameObject slot = GameObject.Instantiate(eventPrefab, eventList); EventInfo item = slot.GetComponent(); item.eventId = sceneData.Value.ID; + item.eventName.text = sceneData.Value.Note; if (item.IsOpen) { @@ -306,12 +310,14 @@ public class SelectScenePanel : MonoBehaviour bool eventSelected = false; // 检查是否有场景被选择 foreach (EventInfo item in eventInfoList) { - // 检查当前的 Toggle 是否被选中 if (item.gameObject.transform.GetComponent().isOn) { // 设置场景名称 this.eventName = item.eventName.text; // 获取 Text 组件的文本 + this.eventId = item.eventId; + EventData eventData = jsonReader.GetEvenById(this.eventId); + InstantiateIncidentPrefab(2001); createTemplateInfo.Instance.auth_CreateTemplate.sceneId = item.eventId.ToString(); Debug.Log(this.eventName); eventSelected = true; @@ -413,7 +419,7 @@ public class SelectScenePanel : MonoBehaviour { SelectEvent(); SelsctDifficulty(); - SelectEvnentBtn(); + //SelectEvnentBtn(); SetDataPanelInfo(); this.gameObject.SetActive(false); } @@ -434,8 +440,6 @@ public class SelectScenePanel : MonoBehaviour eventToggleList.Clear(); eventId = -1; eventName = string.Empty; - - Debug.Log("事件列表已清空,UI已重置"); if (schoolChoiceLable.gameObject.active == false) { sceneLable.gameObject.SetActive(true); @@ -544,8 +548,6 @@ public class SelectScenePanel : MonoBehaviour item.GetComponent().interactable = true; } } - - } //设置日期界面的数据