Merge branch 'main' of http://shu.sheziwanglo.cn:3000/wulongxiao/_xiaofang

2024-12-28 16:43:20 +08:00 · 2024-12-28 16:43:20 +08:00 · 566285caa8
commit 566285caa8
parent 1632a1f0bd a6ed725913
5 changed files with 891 additions and 228 deletions
--- a/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
+++ b/xiaofang/Assets/Prefabs/PanelPrefabs/Command_End.prefab
@ -6870,7 +6870,7 @@ MonoBehaviour:
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &1986279549173157408
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -6907,7 +6907,6 @@ MonoBehaviour:
  DiaLogBox2: {fileID: 1986279547715622013}
  Right_Message: {fileID: 1986279549232645831}
  Right_Message2: {fileID: 1986279548795827112}
-  dropdwn: {fileID: 0}
  Tip123: {fileID: 0}
  MapTapPanel: {fileID: 6389238419783627009}
  Command02: {fileID: 2991637681471873777}
@ -6929,12 +6928,6 @@ MonoBehaviour:
  TP_3: {fileID: 1986279548399004370}
  TP_4: {fileID: 1986279547719244043}
  Intercom: {fileID: 0}
-  Prop1: {fileID: 0}
-  Prop2: {fileID: 0}
-  Prop3: {fileID: 0}
-  Prop4: {fileID: 0}
-  Prop5: {fileID: 0}
-  Prop6: {fileID: 0}
  DialogboxSure: {fileID: 1986279548770340787}
  Dialogbox2A: {fileID: 1986279549002270256}
  Dialogbox2B: {fileID: 1986279548425159737}
@ -7015,6 +7008,7 @@ MonoBehaviour:
  showPositionX: 0
  hidePositionX: 0
  bg: {fileID: 0}
+  isFrist: 0
  gridLayoutGroup: {fileID: 3221337158919056189}
 --- !u!1 &1986279549197966134
 GameObject:
--- a/xiaofang/Assets/Scenes/HylScene/Test.unity
+++ b/xiaofang/Assets/Scenes/HylScene/Test.unity
@ -1004,6 +1004,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  jSONReader: {fileID: 2009348684}
  isYou: 1
+  isHYL: 0
 --- !u!1 &1509783291
 GameObject:
  m_ObjectHideFlags: 0
@ -1588,123 +1589,123 @@ PrefabInstance:
    m_Modifications:
    - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 344.1
      objectReference: {fileID: 0}
    - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 86.76
      objectReference: {fileID: 0}
    - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 198.05
      objectReference: {fileID: 0}
    - target: {fileID: 1036384108419493601, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -43.38
      objectReference: {fileID: 0}
    - target: {fileID: 1407198451437384586, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 302
      objectReference: {fileID: 0}
    - target: {fileID: 1407198451437384586, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 126
      objectReference: {fileID: 0}
    - target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 101
      objectReference: {fileID: 0}
    - target: {fileID: 1407198451904434455, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 226.40001
      objectReference: {fileID: 0}
    - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 344.1
      objectReference: {fileID: 0}
    - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 86.76
      objectReference: {fileID: 0}
    - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 198.05
      objectReference: {fileID: 0}
    - target: {fileID: 1407198452705769409, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -139.02
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 101
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104053365948, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 226.40001
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 302
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104264456879, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 126
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 344.1
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 86.76
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 198.05
      objectReference: {fileID: 0}
    - target: {fileID: 3032695104320383594, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -139.02
      objectReference: {fileID: 0}
    - target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 68.100006
      objectReference: {fileID: 0}
    - target: {fileID: 3032695105273604146, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 504
      objectReference: {fileID: 0}
    - target: {fileID: 3032695105467395617, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 302
      objectReference: {fileID: 0}
    - target: {fileID: 3032695105467395617, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 126
      objectReference: {fileID: 0}
    - target: {fileID: 3077635299444999927, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_Pivot.x
@ -1796,55 +1797,55 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3077635299444999931, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
+      propertyPath: m_AnchorMax.y
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
    - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 344.1
      objectReference: {fileID: 0}
    - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 86.76
      objectReference: {fileID: 0}
    - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 198.05
      objectReference: {fileID: 0}
    - target: {fileID: 4030979446590429124, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -43.38
      objectReference: {fileID: 0}
    - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
      objectReference: {fileID: 0}
    - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 0
+      value: 344.1
      objectReference: {fileID: 0}
    - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 0
+      value: 86.76
      objectReference: {fileID: 0}
    - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 198.05
      objectReference: {fileID: 0}
    - target: {fileID: 4030979447516607306, guid: 940be89243a038b4090a77556e45a06d, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -43.38
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 940be89243a038b4090a77556e45a06d, type: 3}
--- a/xiaofang/Assets/Scenes/LL_Command_Action_1.unity
+++ b/xiaofang/Assets/Scenes/LL_Command_Action_1.unity
@ -635,6 +635,14 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 1
      objectReference: {fileID: 0}
+    - target: {fileID: 1986279548675747996, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1986279548795827112, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1986279549107877099, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
      propertyPath: m_IsActive
      value: 0
@ -643,6 +651,10 @@ PrefabInstance:
      propertyPath: m_IsActive
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 1986279549173157409, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 0
+      objectReference: {fileID: 0}
    - target: {fileID: 1986279549173157411, guid: 807d6c3842cc1714caf2b4497e4daed7, type: 3}
      propertyPath: m_Pivot.x
      value: 0
--- a/xiaofang/Assets/Scenes/Tmap
+++ b/xiaofang/Assets/Scenes/Tmap
--- a/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs
+++ b/xiaofang/Assets/Script/UI/ZZZZZZ/ZZUIManager.cs
@ -41,10 +41,10 @@ public class ZZUIManager : MonoBehaviour
    /// 为能安全撤离的框
    /// </summary>
    public GameObject Right_Message2;
-    /// <summary>
-    /// 下拉框
-    /// </summary>
-    public Dropdown dropdwn;
+    ///// <summary>
+    ///// 下拉框
+    ///// </summary>
+    //public Dropdown dropdwn;
    /// <summary>
    /// 撤离方案选择
    /// </summary>
@ -111,18 +111,6 @@ public class ZZUIManager : MonoBehaviour
    /// </summary>
    public Button Intercom;
    /// <summary>
-    ///  左边的物品栏
-    /// </summary>
-    public Button Prop1;
-    public Button Prop2;
-    public Button Prop3;
-    /// <summary>
-    /// 右边物品栏 
-    /// </summary>
-    public Button Prop4;
-    public Button Prop5;
-    public Button Prop6;
-    /// <summary>
    /// 撤离方案确定
    /// </summary>
    public Button DialogboxSure;
@ -339,6 +327,8 @@ public class ZZUIManager : MonoBehaviour
    int num = 0;
    public Image bg;

+    public bool isFrist=false;
+
    #region 疏散情况班级排序
    public GridLayoutGroup gridLayoutGroup;
    private List<Text> textFields = new List<Text>();
@ -357,7 +347,7 @@ public class ZZUIManager : MonoBehaviour
    {

        //测试
-        // Frist();
+        Frist();
        //FixWarn(1,jsonReader.SetUIText(50102));
        //string str = jsonReader.SetUIText(50102);
        //Debug.Log(jsonReader.SetUIText(50102));
@ -382,33 +372,6 @@ public class ZZUIManager : MonoBehaviour
            OnClickHideButton();
        });

-        #region 道具
-        Prop1.onClick.AddListener(() =>
-        {
-            Prop(1);
-        });
-        Prop2.onClick.AddListener(() =>
-        {
-            Prop(2);
-        });
-        Prop3.onClick.AddListener(() =>
-        {
-            Prop(3);
-        });
-        Prop4.onClick.AddListener(() =>
-        {
-            Prop(4);
-        });
-        Prop5.onClick.AddListener(() =>
-        {
-            Prop(5);
-        });
-        Prop6.onClick.AddListener(() =>
-        {
-            Prop(6);
-        });
-        #endregion
-
        #region 地标点击事件(地图那四个点)
        TP_1.onClick.AddListener(() =>
        {
@ -454,20 +417,27 @@ public class ZZUIManager : MonoBehaviour
        //打开队形
        Flee.onClick.AddListener(() =>
        {
-            DiaLogBox2.SetActive(true);
-            Close1Panel.SetActive(true);
+            if (!isFrist)
+            {
+                DiaLogBox2.SetActive(true);
+                Close1Panel.SetActive(true);
+            }
+            else
+            {
+                Frist();
+            }
        });

        Close1.onClick.AddListener(() => { Close(); });
        Close2.onClick.AddListener(() => { Close(); });

        //下拉列表(人物选着)
-        dropdwn.onValueChanged.AddListener(delegate
-        {
-            DropdownValueChanged(dropdwn);
-        });
-        //默认开一次这样开局就能默认第一个选项一次
-        DropdownValueChanged(dropdwn);
+        //dropdwn.onValueChanged.AddListener(delegate
+        //{
+        //    DropdownValueChanged(dropdwn);
+        //});
+        ////默认开一次这样开局就能默认第一个选项一次
+        //DropdownValueChanged(dropdwn);

        //右边框框 上报总指 (已经安全撤离的)
        Sumbit.onClick.AddListener(() =>
@ -531,30 +501,7 @@ public class ZZUIManager : MonoBehaviour
    }
    private void Update()
    {
-        //测试面板
-        if (Input.GetKeyDown("j"))
-        {
-            //string str = "aaa";
-            //FixWarnPanelText(str);
-            //WarnPanel();
-            GcreationSelect(10829);
-            Frist();
-
-        }
-        if (Input.GetKeyDown("k"))
-        {
-            FixWarnPanelText("aaaa");
-        }
-        // 更新时间
-        timeElapsed += Time.deltaTime;
-
-        // 计算分钟和秒数
-        int minutes = Mathf.FloorToInt(timeElapsed / 60);
-        int seconds = Mathf.FloorToInt(timeElapsed % 60);
-
-        // 格式化时间为 "00.00" 格式
-        TimeText.text = string.Format("{0:00}.{1:00}", minutes, seconds);
-
+       

    }
    /// <summary>
@ -588,6 +535,7 @@ public class ZZUIManager : MonoBehaviour
    /// </summary>
    public void Frist()
    {
+        isFrist=true;
        DiaLogBox2?.SetActive(true);
        Close1Panel.SetActive(false);

@ -1047,6 +995,52 @@ public class ZZUIManager : MonoBehaviour
        WarnTip_Text.text = Message;
    }
    /// <summary>
+    /// 给我张三geigei看的（偷懒的，我错了HYLgeigei）
+    /// </summary>
+    /// <param name="ID"></param>
+    public void CSZS(string ID)
+    {
+        switch (ID)
+        {
+            case "8000":
+                Head_Text.text = "主持人";
+                break;
+            case "8001":
+                Head_Text.text = "总指挥";
+                break;
+            case "8002":
+                Head_Text.text = "抢险救援组";
+                break;
+            case "8003":
+                Head_Text.text = "（组长）抢险救援组";
+                break;
+            case "8004":
+                Head_Text.text = "医疗救护组";
+                break;
+            case "8005":
+                Head_Text.text = "（组长）医疗救援组";
+                break;
+            case "8006":
+                Head_Text.text = "疏散引导组1";
+                break;
+            case "8007":
+                Head_Text.text = "疏散引导组2";
+                break;
+            case "8008":
+                Head_Text.text = "后勤保障组";
+                break;
+            case "8009":
+                Head_Text.text = "（组长）后勤保障组";
+                break;
+            case "8010":
+                Head_Text.text = "搜寻组";
+                break;
+            case "8011":
+                Head_Text.text = "学生寝室长";
+                break;
+        }
+    }
+    /// <summary>
    /// 修改总指挥框框 无图像，名字，内容
    /// </summary>
    /// <param name="name">名字</param>