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 m_DicUnitPlayerDatas = new Dictionary(); //局内玩家数据 - // private List m_TeamSortList = new List(); // 用于排序的阵营列表数据 + public List m_TeamSortList = new List(); // 用于排序的阵营列表数据 public float m_GameTimerLen = 0; public List m_Strs = new List() { "陈", "王", "李", "张", "刘", "杨", "黄", "赵", "吴", "周", "徐", "孙", "马", "朱", "胡","何","林","高","罗","郑", @@ -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("Bg/Top/TopImg/m_tmpTimer"); @@ -27,6 +28,7 @@ namespace GameLogic m_btnSetting = FindChildComponent