diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index c3c38d89..126b6b8a 100644 Binary files a/Configs/GameConfig/Datas/TeamConfig.xlsx and b/Configs/GameConfig/Datas/TeamConfig.xlsx differ diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index 6963baf3..c04bef1a 100644 Binary files a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes and b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes differ diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs index a5c6baa3..9b4dc4ea 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs @@ -31,6 +31,7 @@ namespace GameLogic public static int GmActorId = 1; public static int HuangJinShiDaiEnd = 5; // 黄金时代结束时间 + public static int LiShiShiJianEnd = 5; // 历史事件结束时间 // 测试玩家头像Url diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index a8a7521b..27db6aad 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -204,10 +204,13 @@ namespace GameLogic } }); + + var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get( + DataGameSceneManager.Instance.m_TeamId); + // 设置用户信息 m_textHuangJinInfo.text = string.Format( - ConfigSystem.Instance.Tables.TbTeamConfig.Get( - DataGameSceneManager.Instance.m_TeamId).TextInfo, + config.TextInfo, DataGameSceneManager.Instance.sjDatas[0] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[0].name, DataGameSceneManager.Instance.sjDatas[1] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[1].name, DataGameSceneManager.Instance.sjDatas[2] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[2].name @@ -215,8 +218,7 @@ namespace GameLogic // 设置图片从透明到不透明 - m_img_HuangJinShiDai.color = new Color(1, 1, 1, 0); - m_img_HuangJinShiDai.CrossFadeAlpha(1, 1f, false); + m_img_HuangJinShiDai.sprite = GameModule.Resource.LoadAsset(config.ImgName); DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 @@ -224,8 +226,9 @@ namespace GameLogic // 等待五秒钟后关闭 UniTask.Delay(5000).ContinueWith(() => { - m_img_HuangJinShiDai.CrossFadeAlpha(0, 1f, false); + m_img_HuangJinShiDai.gameObject.SetActive(false); + m_rect_ShiJian.gameObject.SetActive(false); }); } @@ -313,12 +316,15 @@ namespace GameLogic } }); + m_img_HuangJinShiDai.gameObject.SetActive(true); + var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId); + // 设置用户信息 m_textHuangJinInfo.text = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).LoswerInfo; // 设置图片从透明到不透明 - m_img_HuangJinShiDai.color = new Color(1, 1, 1, 0); - m_img_HuangJinShiDai.CrossFadeAlpha(1, 1f, false); + m_img_HuangJinShiDai.sprite = GameModule.Resource.LoadAsset(config.ImgName); + DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 @@ -326,12 +332,12 @@ namespace GameLogic // 等待五秒钟后关闭 UniTask.Delay(5000).ContinueWith(() => { - m_img_HuangJinShiDai.CrossFadeAlpha(0, 1f, false); m_img_HuangJinShiDai.gameObject.SetActive(false); + m_rect_ShiJian.gameObject.SetActive(false); }); - }, 30); + }, EventConts.LiShiShiJianEnd); } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs index 54eb8893..6427da10 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs @@ -23,6 +23,7 @@ public sealed partial class TeamConfig : Luban.BeanBase ScoreTargetValue = _buf.ReadInt(); OneScoreTargetValue = _buf.ReadInt(); VideoName = _buf.ReadString(); + ImgName = _buf.ReadString(); LoswerInfo = _buf.ReadString(); TextInfo = _buf.ReadString(); } @@ -61,6 +62,10 @@ public sealed partial class TeamConfig : Luban.BeanBase /// public readonly string VideoName; /// + /// 图片名称 + /// + public readonly string ImgName; + /// /// 描述文字 /// public readonly string LoswerInfo; @@ -86,6 +91,7 @@ public sealed partial class TeamConfig : Luban.BeanBase + "ScoreTargetValue:" + ScoreTargetValue + "," + "OneScoreTargetValue:" + OneScoreTargetValue + "," + "VideoName:" + VideoName + "," + + "ImgName:" + ImgName + "," + "LoswerInfo:" + LoswerInfo + "," + "TextInfo:" + TextInfo + "," + "}";