From 65507bbb4ce2975b7d2373d3de9d6e119c8a3644 Mon Sep 17 00:00:00 2001
From: "SD-20250415ABSO\\Administrator" <Cjw>
Date: Thu, 24 Apr 2025 17:46:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=A8=AA=E7=89=88=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E5=88=97=E8=A1=A8=EF=BC=8C=E4=B8=8B=E4=B8=80=E6=AD=A5?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E8=AE=A1=E7=AE=97=E4=BB=96=E7=9A=84=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/AssetRaw/UI/UIGameBattle.prefab    |   2 +-
 .../HotFix/GameLogic/Actor/ActorHItem.cs      |  15 ++
 .../HotFix/GameLogic/Actor/ActorHItem.cs.meta |  11 ++
 .../GameLogic/Manager/DataGameSceneManager.cs |   8 +-
 .../HotFix/GameLogic/UI/UIGameBattle.cs       |   8 +-
 .../Layouts/CurrentMaximizeLayout.dwlt        | 156 +++++++++---------
 6 files changed, 114 insertions(+), 86 deletions(-)
 create mode 100644 UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
 create mode 100644 UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs.meta

diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
index 5455a536..b4d5af76 100644
--- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
+++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
@@ -1287,7 +1287,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1950349943801813264}
   m_Layer: 5
-  m_Name: HItem
+  m_Name: m_itemActorHItem
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
new file mode 100644
index 00000000..56b122d3
--- /dev/null
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs
@@ -0,0 +1,15 @@
+using System.Collections;
+using System.Collections.Generic;
+using TEngine;
+using UnityEngine;
+
+namespace GameLogic
+{
+    public class ActorHItem : UIWidget
+    {
+        protected override void OnCreate()
+        {
+            base.OnCreate();
+        }
+    }
+}
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs.meta b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs.meta
new file mode 100644
index 00000000..240d9bf2
--- /dev/null
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cb14f5d0db6ad1940ace047925a1e2c6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
index 20aa3991..675c22e3 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
@@ -15,7 +15,7 @@ namespace GameLogic
 
         private Transform teamList;
         private Dictionary<string, UnitPlayerData> m_DicUnitPlayerDatas = new Dictionary<string, UnitPlayerData>(); //局内玩家数据
-        // private List<Actor> m_TeamSortList = new List<Actor>(); // 用于排序的阵营列表数据
+        public List<ActorHItem> m_TeamSortList = new List<ActorHItem>(); // 用于排序的阵营列表数据
         public float m_GameTimerLen = 0;
         public List<string> m_Strs = new List<string>() { "陈", "王", "李", "张", "刘", "杨", "黄", "赵", "吴", "周",
         "徐", "孙", "马", "朱", "胡","何","林","高","罗","郑",
@@ -65,11 +65,7 @@ namespace GameLogic
 
         private void InitGameTeam()
         {
-            // 根据配置表注册,注册初始化阵营
-            for (int i = 0; i < m_Strs.Count; i++)
-            {
-                
-            }
+
         }
 
         #endregion
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
index d232d247..2a142efb 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
@@ -19,6 +19,7 @@ namespace GameLogic
         private Button m_btnSetting;
         private Button m_btnRank;
         private RectTransform m_rectHPanel;
+        private GameObject m_itemActorHItem;
         protected override void ScriptGenerator()
         {
             m_tmpTimer = FindChildComponent<TextMeshProUGUI>("Bg/Top/TopImg/m_tmpTimer");
@@ -27,6 +28,7 @@ namespace GameLogic
             m_btnSetting = FindChildComponent<Button>("Bg/Top/m_btnSetting");
             m_btnRank = FindChildComponent<Button>("Bg/Top/m_btnRank");
             m_rectHPanel = FindChildComponent<RectTransform>("Bg/Main/m_rectHPanel");
+            m_itemActorHItem = FindChild("Bg/Main/m_rectHPanel/m_itemActorHItem").gameObject;
             m_btnSetting.onClick.AddListener(OnClickSettingBtn);
             m_btnRank.onClick.AddListener(OnClickRankBtn);
         }
@@ -74,7 +76,11 @@ namespace GameLogic
             //RestHItemFunc();
 
             // 创建横板列表
-            
+            for (int i = 0; i < DataGameSceneManager.Instance.m_Strs.Count; i++)
+            {
+                ActorHItem actorHItem = CreateWidgetByPrefab<ActorHItem>(m_itemActorHItem, m_rectHPanel);
+                DataGameSceneManager.Instance.m_TeamSortList.Add(actorHItem);
+            }
 
         }
 
diff --git a/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
index 3d964d71..82001e41 100644
--- a/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
+++ b/UnityProject/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
@@ -21,12 +21,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1920
-    height: 947
+    width: 2560
+    height: 1307
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 1184
+  controlID: 146
 --- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -47,10 +47,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1920
-    y: 696
-    width: 828
-    height: 303
+    x: 0
+    y: 737
+    width: 1104
+    height: 622
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -67,7 +67,7 @@ MonoBehaviour:
   m_ShowGizmos: 0
   m_TargetDisplay: 0
   m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 607, y: 1080}
+  m_TargetSize: {x: 1080, y: 2340}
   m_TextureFilterMode: 0
   m_TextureHideFlags: 61
   m_RenderIMGUI: 1
@@ -76,16 +76,16 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Stats: 0
-  m_SelectedSizes: 0c000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 09000000000000000000000000000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -303.5
-    m_HBaseRangeMax: 303.5
-    m_VBaseRangeMin: -540
-    m_VBaseRangeMax: 540
+    m_HBaseRangeMin: -540
+    m_HBaseRangeMax: 540
+    m_VBaseRangeMin: -1170
+    m_VBaseRangeMax: 1170
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
@@ -103,23 +103,23 @@ MonoBehaviour:
       serializedVersion: 2
       x: 0
       y: 21
-      width: 828
-      height: 282
-    m_Scale: {x: 0.2611111, y: 0.2611111}
-    m_Translation: {x: 413.99997, y: 141}
+      width: 1104
+      height: 601
+    m_Scale: {x: 0.2568376, y: 0.2568376}
+    m_Translation: {x: 552, y: 300.5}
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
-      x: -1585.5319
-      y: -540
-      width: 3171.0637
-      height: 1080
+      x: -2149.218
+      y: -1170
+      width: 4298.436
+      height: 2340
     m_MinimalGUI: 1
-  m_defaultScale: 0.2611111
-  m_LastWindowPixelSize: {x: 828, y: 303}
+  m_defaultScale: 0.2568376
+  m_LastWindowPixelSize: {x: 1104, y: 622}
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_LowResolutionForAspectRatios: 01000000000000000000
@@ -144,12 +144,12 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 829
-    height: 947
+    width: 1105
+    height: 1307
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 1065
+  controlID: 27
 --- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -167,10 +167,10 @@ MonoBehaviour:
     serializedVersion: 2
     x: 0
     y: 0
-    width: 829
-    height: 623
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
+    width: 1105
+    height: 664
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 5}
   m_Panes:
   - {fileID: 5}
@@ -197,10 +197,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1920
+    x: 0
     y: 73
-    width: 828
-    height: 602
+    width: 1104
+    height: 643
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -255,7 +255,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -307,7 +307,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -333,7 +333,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -346,7 +346,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -398,7 +398,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -411,7 +411,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -424,7 +424,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -514,7 +514,7 @@ MonoBehaviour:
       floating: 0
       collapsed: 0
       displayed: 1
-      snapOffset: {x: 48, y: 0}
+      snapOffset: {x: 48, y: 25}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 0
       id: AINavigationOverlay
@@ -723,10 +723,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1920
+    x: 0
     y: 73
-    width: 828
-    height: 568
+    width: 1104
+    height: 643
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -753,9 +753,9 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 623
-    width: 829
-    height: 324
+    y: 664
+    width: 1105
+    height: 643
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 2}
@@ -778,10 +778,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 829
+    x: 1105
     y: 0
-    width: 288
-    height: 947
+    width: 384
+    height: 1307
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 9}
@@ -809,10 +809,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -1091
+    x: 1105
     y: 73
-    width: 286
-    height: 926
+    width: 382
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -828,7 +828,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_LastClickedID: 0
-      m_ExpandedIDs: 20fbffff
+      m_ExpandedIDs: a4f7ffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -844,7 +844,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 8}
+        m_ClientGUIView: {fileID: 4}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -867,12 +867,12 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1117
+    x: 1489
     y: 0
-    width: 454
-    height: 947
-  m_MinSize: {x: 230, y: 250}
-  m_MaxSize: {x: 10000, y: 10000}
+    width: 605
+    height: 1307
+  m_MinSize: {x: 232, y: 271}
+  m_MaxSize: {x: 10002, y: 10021}
   m_ActualView: {fileID: 11}
   m_Panes:
   - {fileID: 11}
@@ -898,10 +898,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -803
+    x: 1489
     y: 73
-    width: 452
-    height: 926
+    width: 603
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -923,7 +923,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets/AssetRaw/Audios
+    - Assets/GameScripts/HotFix/GameLogic/Actor
     m_Globs: []
     m_OriginalText: 
     m_ImportLogFlags: 0
@@ -931,16 +931,16 @@ MonoBehaviour:
   m_ViewMode: 1
   m_StartGridSize: 16
   m_LastFolders:
-  - Assets/AssetRaw/Audios
+  - Assets/GameScripts/HotFix/GameLogic/Actor
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: D:\XXGameProject\GJGameProject\UnityProject
+  m_LastProjectPath: D:\ZqdnGameProject\UnityProject
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 72720000
-    m_LastClickedID: 29298
-    m_ExpandedIDs: 00000000787100007a7100007c7100007e71000080710000827100008471000086710000887100008a7100008c7100008e71000090710000927100009471000096710000987100009a7100009c7100009e710000a0710000a2710000a471000000ca9a3b
+    m_SelectedIDs: aa750000
+    m_LastClickedID: 30122
+    m_ExpandedIDs: 0000000010730000127300001473000016730000187300001a7300001c7300001e730000207300002273000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a7300001e74000028740000ac75000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -968,7 +968,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000787100007a7100007c7100007e71000080710000827100008471000086710000887100008a7100008c7100008e71000090710000927100009471000096710000987100009a7100009c7100009e710000a0710000a2710000a471000000ca9a3b
+    m_ExpandedIDs: 0000000010730000127300001473000016730000187300001a7300001c7300001e73000020730000227300002473000026730000287300002a7300002c7300002e73000030730000327300003473000036730000387300003a730000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -995,7 +995,7 @@ MonoBehaviour:
   m_ListAreaState:
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: 06a60100e45e0000f49c00004c6c0000486c000052980000f0d30100000000002a6e0000a26e0000c46e0000c26e0000be7800003c8b00000485000084d600000cb00000fa8e0000e06d00003673000056720000a68e0000a8720000d07800003e740000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
@@ -1039,10 +1039,10 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1571
+    x: 2094
     y: 0
-    width: 349
-    height: 947
+    width: 466
+    height: 1307
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_ActualView: {fileID: 13}
@@ -1070,10 +1070,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: -349
+    x: 2094
     y: 73
-    width: 348
-    height: 926
+    width: 465
+    height: 1286
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -1087,7 +1087,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
-    m_CachedPref: 201
+    m_CachedPref: 642
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1