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

修复部分Bug

Browse Source
This commit is contained in:
DESKTOP-SAJ6RKV\Administrator 2025-06-04 03:16:46 +08:00
parent 72caab98e5
commit 8fabb1c4f5
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
View File

@ -244,7 +244,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -264.2, y: 532.8} m_AnchoredPosition: {x: -78, y: -16}
m_SizeDelta: {x: 285, y: 29} m_SizeDelta: {x: 285, y: 29}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3189433913552645289 --- !u!222 &3189433913552645289
@ -37091,7 +37091,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -66, y: 536.5} m_AnchoredPosition: {x: 120.20001, y: -12.299927}
m_SizeDelta: {x: 85, y: 42} m_SizeDelta: {x: 85, y: 42}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2461786428479395444 --- !u!222 &2461786428479395444
@ -72767,7 +72767,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -448.5, y: 550.8} m_AnchoredPosition: {x: -262.3, y: 2.000061}
m_SizeDelta: {x: 116, y: 117} m_SizeDelta: {x: 116, y: 117}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8685427069739642340 --- !u!222 &8685427069739642340
@ -78162,8 +78162,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: -194, y: 624}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 673.4304, y: 121.1576}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &7971765919379679797 --- !u!1 &7971765919379679797
GameObject: GameObject:
@ -93071,7 +93071,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -264.2, y: 532.8} m_AnchoredPosition: {x: -78, y: -15.999939}
m_SizeDelta: {x: 285, y: 29} m_SizeDelta: {x: 285, y: 29}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &192554144869663598 --- !u!222 &192554144869663598

4
UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs
View File

@ -28,9 +28,11 @@ namespace GameLogic
public static GameModelType gameModel = GameModelType.快速; public static GameModelType gameModel = GameModelType.快速;
public static int GmActorId = 1; public static int GmActorId = 1;
public static int HuangJinShiDaiEnd = 5; // 黄金时代结束时间
// 测试玩家头像Url // 测试玩家头像Url
public const string TestPlayerUrl = "https://p3.douyinpic.com/aweme/100x100/aweme-avatar/tos-cn-i-0813_2b95d7b6faea4cd09cd872ca826930bc.png"; public const string TestPlayerUrl = "https://p3.douyinpic.com/aweme/100x100/aweme-avatar/tos-cn-i-0813_2b95d7b6faea4cd09cd872ca826930bc.png";

4
UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
View File

@ -704,6 +704,8 @@ namespace GameLogic
GameModule.Timer.RemoveTimer(m_ShiJianTimerId); GameModule.Timer.RemoveTimer(m_ShiJianTimerId);
} }
Log.Debug("游戏朝代切换...");
m_ShiJianTimerId = GameModule.Timer.AddTimer((e) => m_ShiJianTimerId = GameModule.Timer.AddTimer((e) =>
{ {
Log.Debug("触发黄金时代结束"); Log.Debug("触发黄金时代结束");
@ -714,7 +716,7 @@ namespace GameLogic
GameEvent.Send(EventConts.HuangJinGameEnd); GameEvent.Send(EventConts.HuangJinGameEnd);
}, 30); }, EventConts.HuangJinShiDaiEnd);
} }

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

@ -281,6 +281,10 @@ namespace GameLogic
}; };
var videoClip = GameModule.Resource.LoadAsset<VideoClip>(videoName);
m_video_Video.clip = videoClip;
m_video_Video.Play();
// 历史事件时间周期 // 历史事件时间周期
if (m_LishiId != -1) if (m_LishiId != -1)
{ {
@ -380,6 +384,10 @@ namespace GameLogic
// 替换UI图 // 替换UI图
SwitchUIResource(); SwitchUIResource();
// 清除视频上的targetTexture残像
m_video_Video.targetTexture.Release();
}; };
// 播放音频 // 播放音频