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