diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs index 51404c78..216a77d3 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs @@ -135,6 +135,9 @@ public class DataGameModelManager : GameBase.Singleton postPlayRankData.exp = item.Value.protCustMessageData.rankRo.exp; postPlayRankData.lv = item.Value.protCustMessageData.rankRo.lv; postPlayRankData.campName = DataGameSceneManager.Instance.GetStrs(int.Parse(item.Value.teamId) - 1); + + Log.Debug("玩家:{0},贡献积分分配{1}", item.Value.protCustMessageData.nickName, (item.Value.m_GongXianScore % 10000)); + rankInfos.Add(postPlayRankData); } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 7f8ef6b6..f5175cc9 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -441,14 +441,68 @@ namespace GameLogic Log.Debug("触发切换朝代:" + teamId); + if (teamId != 1) { + + // 我想先把他身上的回调取消掉怎么整? + if (m_LishiId != -1) + { + GameModule.Timer.RemoveTimer(m_LishiId); + + + Log.Debug("历史事件失败。。。"); + + DataGameSceneManager.Instance.isLiShiShiJian = false; + + // 告知关闭历史事件了 + // 设置用户信息显示 + DataGameSceneManager.Instance.sjDatas.Sort((a, b) => + { + if (a.count > b.count) + { + return -1; + } + else + { + return 1; + } + }); + + 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.sprite = GameModule.Resource.LoadAsset(config.ImgName); + + // 先播放视频 + string videoName1 = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).ImgName; + GameModule.Audio.Play(TEngine.AudioType.UISound, videoName1 + "_Audio", false, 1, true); + + m_video_SjVideo.loopPointReached += (v) => + { + + m_img_HuangJinShiDai.gameObject.SetActive(false); + m_rect_ShiJian.gameObject.SetActive(false); + DataGameSceneManager.Instance.m_LiShiShiJianLikeCount = 0; + m_video_SjVideo.targetTexture.DiscardContents(); + + }; + var videoClip1 = GameModule.Resource.LoadAsset(videoName1); + m_video_SjVideo.clip = videoClip1; + m_video_SjVideo.Play(); + + + DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 + DataGameSceneManager.Instance.m_LiShiShiJianLikeCount = 0; + } + // 先播放视频 string videoName = "Scene_" + (teamId); - // 我想先把他身上的回调取消掉怎么整? - - //m_video_Video.loopPointReached = null; m_video_Video.loopPointReached -= ShowShiJain;