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-13 09:43:31 +08:00
commit 436b55ebb1
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xiaofang/Assets/Script/JSONReader/JSONReader.cs
View File

@ -5,8 +5,6 @@ using Google.Protobuf.WellKnownTypes;
public class JSONReader : MonoBehaviour public class JSONReader : MonoBehaviour
{ {
// 让 Unity 编辑器能够分别拖入两个不同的 JSON 文件 // 让 Unity 编辑器能够分别拖入两个不同的 JSON 文件
public TextAsset npcJsonFile; // 用来加载 NPC 数据 public TextAsset npcJsonFile; // 用来加载 NPC 数据
public TextAsset locationJsonFile; // 用来加载 Location 数据 public TextAsset locationJsonFile; // 用来加载 Location 数据

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

@ -88,7 +88,6 @@ public class EvacuationPanel : MonoBehaviour
//上传数据 //上传数据
public void totalSubmit() public void totalSubmit()
{ {
Debug.Log(createTemplateInfo.Instance.auth_CreateTemplate + "===============");
NpcList nPC = new NpcList(); NpcList nPC = new NpcList();
nPC.npcId = npcType; nPC.npcId = npcType;
nPC.areaId = roleid; nPC.areaId = roleid;
@ -366,11 +365,16 @@ public class EvacuationPanel : MonoBehaviour
foreach (var kvp in personnelItemsDict) foreach (var kvp in personnelItemsDict)
{ {
if (kvp.Value.personnelImage.gameObject.activeSelf) // 检查 gameObject 是否显示 if (kvp.Value.personnelImage!=null&&kvp.Value.personnelImage.gameObject.activeSelf) // 检查 gameObject 是否显示
{ {
canRedistribute = true; canRedistribute = true;
break; break;
} }
else
{
canRedistribute = false;
break;
}
} }
// 设置重新分配按钮的交互状态 // 设置重新分配按钮的交互状态
redistributeBtn.interactable = canRedistribute; redistributeBtn.interactable = canRedistribute;

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

@ -80,8 +80,6 @@ public class JueseChoicePop : MonoBehaviour
{ {
foreach (var selectedInfo in pair.Value) foreach (var selectedInfo in pair.Value)
{ {
Debug.Log("+++++++++++++++++++++++"+ int.Parse(firstElement));
Debug.Log("-------------------------"+ selectedInfo.dutyId);
if (selectedInfo.dutyId == firstElement) if (selectedInfo.dutyId == firstElement)
{ {
GameObject item = GameObject.Instantiate(classmatePrefab, content); GameObject item = GameObject.Instantiate(classmatePrefab, content);
@ -95,9 +93,6 @@ public class JueseChoicePop : MonoBehaviour
} }
} }
public void SetClassItem(ClassItem classItem) public void SetClassItem(ClassItem classItem)
{ {
this.classItem = classItem; this.classItem = classItem;