From 939132d1e168ce008be1acd92f95c6ae3b1869dd Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 19:11:29 +0800 Subject: [PATCH] 1 --- UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab | 6 +++--- .../HotFix/GameLogic/Manager/DataGameSceneManager.cs | 6 +++--- .../Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab index 0bb74565..e275038b 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab @@ -42510,10 +42510,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2161047130895777792} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 1080, y: 2340} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5552065052100559850 CanvasRenderer: diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index 97b112fb..fa5f3bac 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -39,7 +39,7 @@ namespace GameLogic public long m_AllTeamPush = 0; - public int m_TeamId = 0;// 当前朝代Id + public int m_TeamId = 1;// 当前朝代Id public bool isLiShiShiJian = false; // 是否是历史事件 public int m_LiShiShiJianLikeCount = 0; // 历史事件点赞触发条件 public int m_LiShiShiJianLikeCountMax = 200; // 历史事件点赞触发条件最大值 @@ -756,7 +756,7 @@ namespace GameLogic { if (ScoreAllValue >= ConfigSystem.Instance.Tables.TbTeamConfig.DataList[i].ScoreTargetValue) { - id = i; + id = i + 1; } else { @@ -772,7 +772,7 @@ namespace GameLogic // 切换朝代 m_TeamId = id; - m_ScoreScale = ConfigSystem.Instance.Tables.TbTeamConfig.DataList[m_TeamId].ScoreValue; + m_ScoreScale = ConfigSystem.Instance.Tables.TbTeamConfig.Get(m_TeamId).ScoreValue; GameEvent.Send(EventConts.SwitchTeamId); diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 92fc9eb3..a0107b73 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -304,6 +304,8 @@ namespace GameLogic int teamId = DataGameSceneManager.Instance.m_TeamId; + Log.Debug("当前黄金时代id" + teamId); + // 先播放视频 string videoName = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).VideoName;