Compare commits
No commits in common. "dd2c810c5e92c18176f642b1c74c536b4d52425c" and "f47393fa9f7c20c638b4a13a21d1b9e165953523" have entirely different histories.
dd2c810c5e
...
f47393fa9f
@ -2665,8 +2665,6 @@ MonoBehaviour:
|
|||||||
sceneLable: {fileID: 5900002971020626571, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3}
|
sceneLable: {fileID: 5900002971020626571, guid: 297444ab6ae692b4dbcb38d34e0c5716, type: 3}
|
||||||
content: {fileID: 788248231}
|
content: {fileID: 788248231}
|
||||||
closeBtn: {fileID: 349260647}
|
closeBtn: {fileID: 349260647}
|
||||||
panel: {fileID: 618256462}
|
|
||||||
selectScenePanel: {fileID: 7468736064579811982}
|
|
||||||
jsonReader: {fileID: 1417128757}
|
jsonReader: {fileID: 1417128757}
|
||||||
--- !u!1 &569417021 stripped
|
--- !u!1 &569417021 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
|
@ -101,7 +101,7 @@ public class Panel : Base
|
|||||||
public SelectScenePanel selectScenePanel;
|
public SelectScenePanel selectScenePanel;
|
||||||
public DatePanel datePanel;
|
public DatePanel datePanel;
|
||||||
public WarningPopPanel warningPopPanel;
|
public WarningPopPanel warningPopPanel;
|
||||||
public RequirementPanel requirementPanel;
|
//public RequirementPanel requirementPanel;
|
||||||
|
|
||||||
private bool isPersonSelected = false; // 标志是否选择了人员
|
private bool isPersonSelected = false; // 标志是否选择了人员
|
||||||
private bool isDutySelected = false; // 标志是否选择了职责
|
private bool isDutySelected = false; // 标志是否选择了职责
|
||||||
@ -808,6 +808,7 @@ public class Panel : Base
|
|||||||
public void WhetherToMeet()
|
public void WhetherToMeet()
|
||||||
{
|
{
|
||||||
bool allRequirementsMet = true; // 标记是否所有需求都满足
|
bool allRequirementsMet = true; // 标记是否所有需求都满足
|
||||||
|
|
||||||
// 遍历所有的场景数据
|
// 遍历所有的场景数据
|
||||||
foreach (var item in jsonReader1.locationDictionary)
|
foreach (var item in jsonReader1.locationDictionary)
|
||||||
{
|
{
|
||||||
@ -867,6 +868,7 @@ public class Panel : Base
|
|||||||
{
|
{
|
||||||
// 如果没有找到该场景的职业数据,列出所缺职业
|
// 如果没有找到该场景的职业数据,列出所缺职业
|
||||||
Debug.Log($"场景 {item.Key} 的职业数据未找到,列出缺少的职业和人数:");
|
Debug.Log($"场景 {item.Key} 的职业数据未找到,列出缺少的职业和人数:");
|
||||||
|
|
||||||
// 根据 RoleLimit 列出缺少的职业及其要求人数
|
// 根据 RoleLimit 列出缺少的职业及其要求人数
|
||||||
foreach (var entryInLimit in limit)
|
foreach (var entryInLimit in limit)
|
||||||
{
|
{
|
||||||
@ -906,7 +908,7 @@ public class Panel : Base
|
|||||||
public void OnclickRequirementsBtn()
|
public void OnclickRequirementsBtn()
|
||||||
{
|
{
|
||||||
requirementsPrefab.gameObject.SetActive(true);
|
requirementsPrefab.gameObject.SetActive(true);
|
||||||
requirementPanel.LoadingSceneLable();
|
//requirementPanel.LoadingSceneLable();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ public class DistributionPanel : MonoBehaviour
|
|||||||
{
|
{
|
||||||
GameObject managerPanelInstance = Instantiate(personnelLable, personnelContent);
|
GameObject managerPanelInstance = Instantiate(personnelLable, personnelContent);
|
||||||
PersonnelPanel scenetext = managerPanelInstance.GetComponent<PersonnelPanel>();
|
PersonnelPanel scenetext = managerPanelInstance.GetComponent<PersonnelPanel>();
|
||||||
scenetext.personelPanelText.text = jsonReader.SetUIText(sceneEntry.Key);
|
scenetext.personelPanelText.text = sceneEntry.Key;
|
||||||
scenetext.personelNumText.text = sceneEntry.Value.Count.ToString();
|
scenetext.personelNumText.text = sceneEntry.Value.Count.ToString();
|
||||||
scenetext.CreatePeopleItem(sceneEntry.Value);
|
scenetext.CreatePeopleItem(sceneEntry.Value);
|
||||||
foreach(var scene in sceneEntry.Value)
|
foreach(var scene in sceneEntry.Value)
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using Unity.VisualScripting;
|
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
@ -51,12 +50,4 @@ public class PersonnelPanel : MonoBehaviour
|
|||||||
{
|
{
|
||||||
transform.gameObject.SetActive(false);
|
transform.gameObject.SetActive(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
//动态加载最低配置的人员
|
|
||||||
public void LoadingpersonelItem(Transform personContent,string name)
|
|
||||||
{
|
|
||||||
GameObject gameObject = Instantiate(personelItem, personContent);
|
|
||||||
PersonnelInfo personnelInfo = gameObject.GetComponent<PersonnelInfo>();
|
|
||||||
personnelInfo.name = name;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -439,8 +439,11 @@ public class SelectScenePanel : Base
|
|||||||
public void SubmitBtn()
|
public void SubmitBtn()
|
||||||
{
|
{
|
||||||
datePanel.evetId = this.eventId.ToString();
|
datePanel.evetId = this.eventId.ToString();
|
||||||
|
Debug.LogError("datePanel.evetId"+datePanel.evetId);
|
||||||
datePanel.placeId = this.scnenId.ToString();
|
datePanel.placeId = this.scnenId.ToString();
|
||||||
|
Debug.LogError("datePanel.placeId" + datePanel.placeId);
|
||||||
datePanel.disasterLocation = this.idcidentId.ToString();
|
datePanel.disasterLocation = this.idcidentId.ToString();
|
||||||
|
Debug.LogError("datePanel.disasterLocation" + datePanel.disasterLocation);
|
||||||
SelsctDifficulty();
|
SelsctDifficulty();
|
||||||
SetDataPanelInfo();
|
SetDataPanelInfo();
|
||||||
SetPanel();
|
SetPanel();
|
||||||
|
Loading…
Reference in New Issue
Block a user