From e29f7044df8d4b1f24e68af650e8a1875b157b33 Mon Sep 17 00:00:00 2001
From: lq <3298408835@qq.com>
Date: Wed, 11 Dec 2024 21:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E7=89=A9=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 xiaofang/Assets/Script/Scheduled_03/Panel.cs  | 17 ++++---
 .../Script/UI/PanelUI/EvacuationPanel.cs      | 51 +++++++++++++++++--
 xiaofang/Assets/Script/UI/PeopleItem.cs       |  1 +
 .../Assets/Script/loginScripts/LoginPanel.cs  |  1 +
 4 files changed, 61 insertions(+), 9 deletions(-)

diff --git a/xiaofang/Assets/Script/Scheduled_03/Panel.cs b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
index 6084d7b8..4bafb1fe 100644
--- a/xiaofang/Assets/Script/Scheduled_03/Panel.cs
+++ b/xiaofang/Assets/Script/Scheduled_03/Panel.cs
@@ -20,6 +20,7 @@ public class SelectedInfo
     public string leader;//是否组长
     public int sceneId;//场景Id
     public int dutyId;//职责的Id
+    public string peopleId;//角色Id
 }
 
 public class Panel : MonoBehaviour
@@ -73,6 +74,7 @@ public class Panel : MonoBehaviour
     [Header("数据")]
     public string name, duty, scene;
     public int dutyId;
+    public string peopleId;
     public List<GameObject> peopleList = new List<GameObject>(); // 存储所有已加载的人员预制体
     private List<GameObject> filteredPeopleList = new List<GameObject>(); // 存储筛选后的人员列表
     private GameObject selectedPerson = null; // 当前选中的角色
@@ -113,10 +115,12 @@ public class Panel : MonoBehaviour
         PlayerListResponse playerListResponse=await userInfo.GetPlayerList();
         foreach(PlayerListData player in playerListResponse.data)
         {
-            Debug.Log("Player Name: " + player.UserName);
+            Debug.Log("Player Name: " + player.Id);
+            
             GameObject item = GameObject.Instantiate<GameObject>(peoplePrefab, peopleCountent);
             PeopleItem peopleItem = item.GetComponent<PeopleItem>();
             peopleItem.nameText.text = player.NickName;
+            peopleItem.peopleId = player.Id;
             Button peoplebutton = item.transform.Find("TextBtn").GetComponent<Button>();
             peoplebutton.onClick.AddListener(() => OnPeopleItemClicked(item, Color.yellow, selectedPerson));
             peopleList.Add(item);// 将每个实例化的角色添加到列表中
@@ -325,9 +329,6 @@ public class Panel : MonoBehaviour
     //处理点击确认按钮
     public void ClickSureBtn()
     {
-        Debug.LogError(">>>>>>>>>>>>>"+ isPersonSelected);
-        Debug.LogError(">>>>>>>>>>>>>"+ isDutySelected);
-        Debug.LogError(">>>>>>>>>>>>>"+ isSceneSelected);
             // 只有在选择了人员、职责和场景的情况下，才会执行后续操作
         if (isPersonSelected && isDutySelected && isSceneSelected)
         {
@@ -364,7 +365,8 @@ public class Panel : MonoBehaviour
                     duty = selectedInfo.duty,
                     scene = selectedInfo.scene,
                     dutyId = selectedInfo.dutyId,
-                    sceneId = selectedInfo.sceneId
+                    sceneId = selectedInfo.sceneId,
+                    peopleId=selectedInfo.peopleId
                 };
                 
                 // 将当前选中的人员信息添加到对应场景的人员列表中
@@ -429,9 +431,12 @@ public class Panel : MonoBehaviour
                     if (buttonText != null && buttonText.tag == Tags.people) // 获取标签为人员的信息                             
                     {
                         name = buttonText.text;
-                        Debug.LogError(name);
+                        PeopleItem peopleItem = buttonText.gameObject.GetComponent<PeopleItem>();
                         selectedInfo.name = name;
+                        //Debug.LogError("???????????????????"+ peopleItem.peopleId == null);
+                        //selectedInfo.peopleId = peopleItem.peopleId;
                         isPersonSelected = true;  // 选择了人员
+                        Debug.LogError(">>>>>>>>>>>>>>>>" + selectedInfo.peopleId);
                     }
                     else if (buttonText != null && buttonText.tag == Tags.scene) // 获取标签为场景的信息
                     {
diff --git a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
index 8cb2599a..cea2642a 100644
--- a/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
+++ b/xiaofang/Assets/Script/UI/PanelUI/EvacuationPanel.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Xml.Serialization;
 using Unity.VisualScripting;
 using UnityEngine;
@@ -56,6 +57,7 @@ public class EvacuationPanel : MonoBehaviour
     Dictionary<int, PersonnelItem> personnelItemsDict = new Dictionary<int, PersonnelItem>();
     private HashSet<int> excludedAreas = new HashSet<int>(); // 被清空的区域 ID
     public SelectScenePanel selectScene;
+    private HashSet<int> clearedAreas = new HashSet<int>();
     // Start is called before the first frame update
     void Start()
     {
@@ -298,7 +300,6 @@ public class EvacuationPanel : MonoBehaviour
         }
         // 清空人员列表
         personnelItems.Clear();
-
         foreach (var sceneEntry in panel.sceneDataDictionary)
         {
             foreach (var sceneInfo in sceneEntry.Value)
@@ -429,13 +430,12 @@ public class EvacuationPanel : MonoBehaviour
         foreach (var kvp in personnelItemsDict)
         {
             PersonnelItem item = kvp.Value;
-
             // 如果 gameObject 是激活的，表示需要清空 NPC
             if (item.personnelImage.gameObject.activeSelf)
             {
                 totalRedistributePeople += item.Num; // 累加需要重新分配的 NPC 数量
                 item.Num = 0; // 清空该区域的 NPC 数量
-                item.SetInfo("0"); // 更新 UI 显示
+                item.SetInfo(""); // 更新 UI 显示
                 item.personnelImage.gameObject.SetActive(false); // 隐藏图标
                 excludedAreas.Add(kvp.Key); // 记录清空的区域 ID
                 Debug.Log($"Cleared NPCs from Scene ID: {kvp.Key}");
@@ -516,5 +516,50 @@ public class EvacuationPanel : MonoBehaviour
             classCount.gameObject.SetActive(false);
         }
     }
+    //// 1. 把所选区域的NPC分配到其它区域
+    //public void RedistributeNpc(int selectedAreaId)
+    //{
+    //    // 获取所有非已清空的区域ID
+    //    var availableAreas = GetNonZeroNpcRatioAreas().Where(areaId => areaId != selectedAreaId && !clearedAreas.Contains(areaId)).ToList();
 
+    //    // 从选中的区域获取NPC
+    //    int npcToRedistribute = distributePeople[selectedAreaId.ToString()];
+
+    //    if (npcToRedistribute == 0) return;
+
+    //    // 移除该区域的NPC
+    //    distributePeople[selectedAreaId.ToString()] = 0;
+    //    //personnelItemsDict[selectedAreaId].UpdateNpcCount(0); // 假设你有一个更新UI的方法
+
+    //    // 将这些NPC分配到其它区域
+    //    DistributeNpcToOtherAreas(npcToRedistribute, availableAreas);
+    //}
+
+    //// 2. 记录被清空NPC分布的区域ID，下次重新分配时这些区域不参与分配
+    //private void DistributeNpcToOtherAreas(int npcToRedistribute, List<int> availableAreas)
+    //{
+    //    if (availableAreas.Count == 0) return;
+
+    //    // 简单的均分方式，你可以根据自己的需要修改分配策略
+    //    int npcPerArea = npcToRedistribute / availableAreas.Count;
+    //    foreach (var areaId in availableAreas)
+    //    {
+    //        distributePeople[areaId.ToString()] += npcPerArea;
+    //        //personnelItemsDict[areaId].UpdateNpcCount(distributePeople[areaId]);
+    //    }
+
+    //    // 如果有剩余的NPC，可以将其分配到其他区域
+    //    int remainder = npcToRedistribute % availableAreas.Count;
+    //    for (int i = 0; i < remainder; i++)
+    //    {
+    //        distributePeople[availableAreas[i]] += 1;
+    //        //personnelItemsDict[availableAreas[i]].UpdateNpcCount(distributePeople[availableAreas[i]]);
+    //    }
+    //}
+
+    //// 重新分配前，清空区域时调用此方法，记录清空区域
+    //public void MarkAreaAsCleared(int areaId)
+    //{
+    //    clearedAreas.Add(areaId);
+    //}
 }
diff --git a/xiaofang/Assets/Script/UI/PeopleItem.cs b/xiaofang/Assets/Script/UI/PeopleItem.cs
index 6fea117a..04e5140c 100644
--- a/xiaofang/Assets/Script/UI/PeopleItem.cs
+++ b/xiaofang/Assets/Script/UI/PeopleItem.cs
@@ -6,6 +6,7 @@ using UnityEngine.UI;
 public class PeopleItem : MonoBehaviour
 {
     public Text nameText;  // 人员名字显示
+    public string peopleId;
     public Button button;  // 按钮，用来选择人员
     public Color defaultColor = Color.white;  // 默认颜色
     public Color addedColor = Color.gray; // 已添加颜色
diff --git a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
index e16a5763..1401ec2e 100644
--- a/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
+++ b/xiaofang/Assets/Script/loginScripts/LoginPanel.cs
@@ -51,6 +51,7 @@ public class LoginPanel : MonoBehaviour
         };
 
         // 发送请求
+        Debug.Log("登陆入参"+ JsonUtility.ToJson(loginBody));
         string response = await web.SendRequest(web.URL + "/auth/login", "POST", JsonUtility.ToJson(loginBody));
         Debug.Log("登录" + response);