diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index 5be82ed6..c5e6e203 100644 Binary files a/Configs/GameConfig/Datas/TeamConfig.xlsx and b/Configs/GameConfig/Datas/TeamConfig.xlsx differ diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas index c509ddcf..2e5315d7 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜.spriteatlas @@ -89,10 +89,55 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: [] + packedSpriteRenderDataKeys: + - f8de1550cddd55e49841d596c9edcd74: 21300000 + - 4fc99ab111d45a34591903d52ff0d446: 21300000 + - d99163d14298deb499a73e1b59928b67: 21300000 + - 362df9338a474e84d804138c397a8acd: 21300000 + - 628d5f63dcbf70246b75747c8a8b0418: 21300000 + - e568a9858ae0b6947bd79fafaa62130c: 21300000 + - a0ef531775b048a48952ffcaa0e0a3a5: 21300000 + - dafc8c27c532c06459df80f623c02708: 21300000 + - b30494c8e3c9089438a965ff0d986aeb: 21300000 + - 83bc42693ded8694383a5b24e411bb3d: 21300000 + - 8951c7f99e07487499ed38049129f913: 21300000 + - 78b18a7a9f3c7da4f8cd13689bb3dc8f: 21300000 + - 03e1050c5f603e34080697c84e91748a: 21300000 + - 2a24d7cc45511384cbd2705fdafa7fb5: 21300000 + - 8b7c17dca096f454c9945d1b52b5216f: 21300000 m_MasterAtlas: {fileID: 0} - m_PackedSprites: [] - m_PackedSpriteNamesToIndex: [] + m_PackedSprites: + - {fileID: 21300000, guid: f8de1550cddd55e49841d596c9edcd74, type: 3} + - {fileID: 21300000, guid: 4fc99ab111d45a34591903d52ff0d446, type: 3} + - {fileID: 21300000, guid: d99163d14298deb499a73e1b59928b67, type: 3} + - {fileID: 21300000, guid: 362df9338a474e84d804138c397a8acd, type: 3} + - {fileID: 21300000, guid: 628d5f63dcbf70246b75747c8a8b0418, type: 3} + - {fileID: 21300000, guid: e568a9858ae0b6947bd79fafaa62130c, type: 3} + - {fileID: 21300000, guid: a0ef531775b048a48952ffcaa0e0a3a5, type: 3} + - {fileID: 21300000, guid: dafc8c27c532c06459df80f623c02708, type: 3} + - {fileID: 21300000, guid: b30494c8e3c9089438a965ff0d986aeb, type: 3} + - {fileID: 21300000, guid: 83bc42693ded8694383a5b24e411bb3d, type: 3} + - {fileID: 21300000, guid: 8951c7f99e07487499ed38049129f913, type: 3} + - {fileID: 21300000, guid: 78b18a7a9f3c7da4f8cd13689bb3dc8f, type: 3} + - {fileID: 21300000, guid: 03e1050c5f603e34080697c84e91748a, type: 3} + - {fileID: 21300000, guid: 2a24d7cc45511384cbd2705fdafa7fb5, type: 3} + - {fileID: 21300000, guid: 8b7c17dca096f454c9945d1b52b5216f, type: 3} + m_PackedSpriteNamesToIndex: + - phb + - zlyj + - 4_d + - fh + - 2_d2 + - jsbeij + - JS_d_box + - 3_d + - 2_d + - 1_d1 + - 1_d + - js_bt + - 3_d3 + - "\u6700\u5F3A\u5927\u8111\u4E16\u754C\u6392\u884C1" + - SJPM_icon m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u7ED3\u7B97\u699C" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index 5ce34e5f..197cf131 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/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 0011a51a..7b9f524b 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -199,7 +199,7 @@ namespace GameLogic // 更新界面逻辑 // 目前固定两百个点赞逻辑。 m_tmp_ShiJianValue.text = string.Format("{0}/200", DataGameSceneManager.Instance.m_LiShiShiJianLikeCount); - + m_img_JinDu.fillAmount = (float)(DataGameSceneManager.Instance.m_LiShiShiJianLikeCount / (float)DataGameSceneManager.Instance.m_LiShiShiJianLikeCountMax); @@ -261,6 +261,9 @@ namespace GameLogic }; + var videoClip = GameModule.Resource.LoadAsset(videoName); + m_video_SjVideo.clip = videoClip; + m_video_SjVideo.Play(); DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 @@ -377,15 +380,19 @@ namespace GameLogic // 先播放视频 string videoName = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).ImgName; - m_video_Video.loopPointReached += (v) => + m_video_SjVideo.loopPointReached += (v) => { m_img_HuangJinShiDai.gameObject.SetActive(false); m_rect_ShiJian.gameObject.SetActive(false); DataGameSceneManager.Instance.m_LiShiShiJianLikeCount = 0; - m_video_Video.targetTexture.DiscardContents(); + m_video_SjVideo.targetTexture.DiscardContents(); }; + var videoClip = GameModule.Resource.LoadAsset(videoName); + m_video_SjVideo.clip = videoClip; + m_video_SjVideo.Play(); + DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 DataGameSceneManager.Instance.m_LiShiShiJianLikeCount = 0; @@ -400,6 +407,7 @@ namespace GameLogic int teamId = DataGameSceneManager.Instance.m_TeamId; + Log.Debug("触发切换朝代:" + teamId); if (teamId != 1) { @@ -457,14 +465,12 @@ namespace GameLogic // 播放音频 var videoAudioName = "csm_audios"; - GameModule.Audio.Play(TEngine.AudioType.Sound, videoAudioName, false, 0.5f, true); + GameModule.Audio.Play(TEngine.AudioType.UISound, videoAudioName, false, 0.5f, true); var videoClip = GameModule.Resource.LoadAsset(videoName); m_video_Video.clip = videoClip; m_video_Video.Play(); - } - else - { + for (int i = 0; i < m_rectBgList.childCount; i++) { m_rectBgList.GetChild(i).gameObject.SetActive(false); @@ -485,25 +491,28 @@ namespace GameLogic m_rectSpeed.GetChild(i).gameObject.SetActive(false); } - - - if (teamId > m_rectBgList.childCount) + for (int i = 0; i < m_rectSpeed.childCount; i++) { - Log.Error("背景Id错误" + teamId); - return; + m_rectTopFx.GetChild(i).gameObject.SetActive(false); } - - m_rectBgList.GetChild(teamId).gameObject.SetActive(true); - m_rectSdx.GetChild(teamId).gameObject.SetActive(true); - m_rectSceneFx.GetChild(teamId).gameObject.SetActive(true); - m_rectSpeed.GetChild(teamId).gameObject.SetActive(true); - - - // 替换UI图 - SwitchUIResource(); } + if (teamId > m_rectBgList.childCount) + { + Log.Error("背景Id错误" + teamId); + return; + } + + m_rectBgList.GetChild(teamId - 1).gameObject.SetActive(true); + m_rectSdx.GetChild(teamId - 1).gameObject.SetActive(true); + m_rectSceneFx.GetChild(teamId - 1).gameObject.SetActive(true); + m_rectSpeed.GetChild(teamId - 1).gameObject.SetActive(true); + m_rectTopFx.GetChild(teamId - 1).gameObject.SetActive(true); + + + // 替换UI图 + SwitchUIResource(); } @@ -515,7 +524,7 @@ namespace GameLogic var jiaRuItem = GameObject.Instantiate(m_rect_GiftPanel.transform.GetChild(1)); jiaRuItem.transform.SetParent(m_rect_GiftPanel); jiaRuItem.transform.localScale = Vector3.one; - jiaRuItem.transform.localPosition = new Vector3(350,0,0); + jiaRuItem.transform.localPosition = new Vector3(350, 0, 0); jiaRuItem.gameObject.SetActive(true); jiaRuItem.GetComponent().OnInit(unitPlayerData); @@ -649,3 +658,4 @@ namespace GameLogic } } +