From 72caab98e5199aff7fd9a1e9d6e5dd57c476778c Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 03:08:23 +0800 Subject: [PATCH] =?UTF-8?q?=E9=BB=84=E9=87=91=E5=91=A8=E6=9C=9F=E3=80=81?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/GameConfig/Datas/TeamConfig.xlsx | Bin 12904 -> 12906 bytes .../bytes/teamconfig_tbteamconfig.bytes | Bin 1014 -> 2076 bytes .../HotFix/GameLogic/UI/UIGameBattle.cs | 55 +++++++++++++++++- .../GameConfig/teamConfig/TeamConfig.cs | 6 ++ 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index 47444330d6a8dfe871492560e87b5ac2167381b6..c3c38d89a5d1c3e46e779d53202ea111fba49e57 100644 GIT binary patch delta 8085 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 delta 36 mcmbOu@Qr= DataGameSceneManager.Instance.m_LiShiShiJianLikeCountMax) { + Log.Debug("历史事件成功。。。"); + DataGameSceneManager.Instance.isLiShiShiJian = false; // 重置 // 触发历史事件条件 @@ -233,6 +235,7 @@ namespace GameLogic } protected override void RegisterEvent() + { base.RegisterEvent(); GameEvent.AddEventListener(EventConts.RestGameBattle, RestGameBattleFunc); @@ -256,6 +259,7 @@ namespace GameLogic } + private int m_LishiId = -1; /// /// 黄金时代结束 /// @@ -276,6 +280,55 @@ namespace GameLogic DataGameSceneManager.Instance.isLiShiShiJian = true; }; + + // 历史事件时间周期 + if (m_LishiId != -1) + { + GameModule.Timer.RemoveTimer(m_LishiId); + } + + // 历史事件维持时间周期 + m_LishiId = GameModule.Timer.AddTimer((e) => + { + + Log.Debug("历史事件失败。。。"); + + DataGameSceneManager.Instance.isLiShiShiJian = false; + + // 告知关闭历史事件了 + // 设置用户信息显示 + DataGameSceneManager.Instance.sjDatas.Sort((a, b) => + { + if (a.count > b.count) + { + return -1; + } + else + { + return 1; + } + }); + + // 设置用户信息 + 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); + + + DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 + + // 等待五秒钟后关闭 + UniTask.Delay(5000).ContinueWith(() => + { + m_img_HuangJinShiDai.CrossFadeAlpha(0, 1f, false); + m_img_HuangJinShiDai.gameObject.SetActive(false); + + }); + + }, 30); + } private void SwitchTeamIdFunc() diff --git a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs index fd8f3460..54eb8893 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(); + LoswerInfo = _buf.ReadString(); TextInfo = _buf.ReadString(); } @@ -62,6 +63,10 @@ public sealed partial class TeamConfig : Luban.BeanBase /// /// 描述文字 /// + public readonly string LoswerInfo; + /// + /// 描述文字 + /// public readonly string TextInfo; public const int __ID__ = -325757586; @@ -81,6 +86,7 @@ public sealed partial class TeamConfig : Luban.BeanBase + "ScoreTargetValue:" + ScoreTargetValue + "," + "OneScoreTargetValue:" + OneScoreTargetValue + "," + "VideoName:" + VideoName + "," + + "LoswerInfo:" + LoswerInfo + "," + "TextInfo:" + TextInfo + "," + "}"; }