Cjw/Zqdn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DESKTOP-SAJ6RKV\Administrator 2025-06-13 01:39:50 +08:00
parent d4a502c62b
commit 21544741ce
2 changed files with 52 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_勋章.spriteatlas
View File

@ -85,10 +85,43 @@ SpriteAtlas:
bindAsDefault: 1 bindAsDefault: 1
isAtlasV2: 0 isAtlasV2: 0
cachedData: {fileID: 0} cachedData: {fileID: 0}
packedSpriteRenderDataKeys: [] packedSpriteRenderDataKeys:
- 49ae77f0715164c47b33f3bb92cec6b5: 21300000
- 89facd118d5211748b5af117a4bfe7b7: 21300000
- 09417bd1cb5657247b2cfd2cac40149a: 21300000
- 22f850a512e37024ebf7ac170d70e7bc: 21300000
- 75b01d666f026bf49b657e7a95102c9b: 21300000
- 3abf5b09978d92846a47fa939eb81faf: 21300000
- 9425123995fe49f4c955e670ca75d536: 21300000
- eb39c46a6992e0c468c9e0528ad1141a: 21300000
- b4523a6a8261d1045b9086f05ba634b0: 21300000
- aa71876d530ed5a49987f64918831456: 21300000
- 317f03ce55a5b864ab0236b58931c088: 21300000
m_MasterAtlas: {fileID: 0} m_MasterAtlas: {fileID: 0}
m_PackedSprites: [] m_PackedSprites:
m_PackedSpriteNamesToIndex: [] - {fileID: 21300000, guid: 49ae77f0715164c47b33f3bb92cec6b5, type: 3}
- {fileID: 21300000, guid: 89facd118d5211748b5af117a4bfe7b7, type: 3}
- {fileID: 21300000, guid: 09417bd1cb5657247b2cfd2cac40149a, type: 3}
- {fileID: 21300000, guid: 22f850a512e37024ebf7ac170d70e7bc, type: 3}
- {fileID: 21300000, guid: 75b01d666f026bf49b657e7a95102c9b, type: 3}
- {fileID: 21300000, guid: 3abf5b09978d92846a47fa939eb81faf, type: 3}
- {fileID: 21300000, guid: 9425123995fe49f4c955e670ca75d536, type: 3}
- {fileID: 21300000, guid: eb39c46a6992e0c468c9e0528ad1141a, type: 3}
- {fileID: 21300000, guid: b4523a6a8261d1045b9086f05ba634b0, type: 3}
- {fileID: 21300000, guid: aa71876d530ed5a49987f64918831456, type: 3}
- {fileID: 21300000, guid: 317f03ce55a5b864ab0236b58931c088, type: 3}
m_PackedSpriteNamesToIndex:
- qt_2
- qt_7
- qt_9
- qt_10
- qt_3
- qt_5
- qt_8
- qt_6
- "\u6700\u5F3A\u5927\u8111\u4E16\u754C\u6392\u884C2"
- qt_4
- qt_1
m_RenderDataMap: {} m_RenderDataMap: {}
m_Tag: "UIRaw_Atlas_\u52CB\u7AE0" m_Tag: "UIRaw_Atlas_\u52CB\u7AE0"
m_IsVariant: 0 m_IsVariant: 0

25
UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
View File

@ -327,6 +327,15 @@ namespace GameLogic
m_rectGjsk.gameObject.SetActive(true); m_rectGjsk.gameObject.SetActive(true);
} }
private void ShowShiJain(VideoPlayer source)
{
// 弹个UI窗口
m_rect_ShiJian.gameObject.SetActive(true);
// 创建itme 实时更新进度条显示
DataGameSceneManager.Instance.isLiShiShiJian = true;
}
private int m_LishiId = -1; private int m_LishiId = -1;
/// <summary> /// <summary>
/// 黄金时代结束 /// 黄金时代结束
@ -342,15 +351,7 @@ namespace GameLogic
string videoName = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).VideoName; string videoName = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).VideoName;
GameModule.Audio.Play(TEngine.AudioType.UISound, videoName + "_Audio", false, 1, true); GameModule.Audio.Play(TEngine.AudioType.UISound, videoName + "_Audio", false, 1, true);
m_video_Video.loopPointReached += (v) => m_video_Video.loopPointReached += ShowShiJain;
{
// 弹个UI窗口
m_rect_ShiJian.gameObject.SetActive(true);
// 创建itme 实时更新进度条显示
DataGameSceneManager.Instance.isLiShiShiJian = true;
};
var videoClip = GameModule.Resource.LoadAsset<VideoClip>(videoName); var videoClip = GameModule.Resource.LoadAsset<VideoClip>(videoName);
m_video_Video.clip = videoClip; m_video_Video.clip = videoClip;
@ -431,6 +432,12 @@ namespace GameLogic
// 先播放视频 // 先播放视频
string videoName = "Scene_" + (teamId); string videoName = "Scene_" + (teamId);
// 我想先把他身上的回调取消掉怎么整？
//m_video_Video.loopPointReached = null;
m_video_Video.loopPointReached -= ShowShiJain;
m_video_Video.loopPointReached += (v) => m_video_Video.loopPointReached += (v) =>
{ {
for (int i = 0; i < m_rectBgList.childCount; i++) for (int i = 0; i < m_rectBgList.childCount; i++)