diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx
index 6036b505..66e12366 100644
Binary files a/Configs/GameConfig/Datas/TeamConfig.xlsx and b/Configs/GameConfig/Datas/TeamConfig.xlsx differ
diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes
index cf3eed18..64c81b37 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/AssetRaw/UI/UIGameBattle.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
index cbc097ba..19fbe081 100644
--- a/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
+++ b/UnityProject/Assets/AssetRaw/UI/UIGameBattle.prefab
@@ -36270,6 +36270,85 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
+--- !u!1 &2347643020681004991
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 185706832472226134}
+ - component: {fileID: 5893444544671038767}
+ - component: {fileID: 3495051797275668568}
+ m_Layer: 5
+ m_Name: m_textHuangJinInfo
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &185706832472226134
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2347643020681004991}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 1774168000858424399}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0.000061035, y: -77.354}
+ m_SizeDelta: {x: 1080, y: 254.71}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5893444544671038767
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2347643020681004991}
+ m_CullTransparentMesh: 1
+--- !u!114 &3495051797275668568
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2347643020681004991}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 48
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 0
+ m_MaxSize: 300
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: "\u5728\u3010\u7528\u6237xxx\u3011\u3010\u7528\u6237xxxx\u3011\u548C\u3010\u7528\u6237xxxx\u3011\u7B49\u5148\u9A71\u8005\u7684\u5E26\u9886\u4E0B\uFF0C\u53E4\u5148\u6C11\u6210\u529F\u638C\u63E1\u3010\u94BB\u6728\u53D6\u706B\u3011\u4E4B\u672F\uFF01\u6587\u660E\u7684\u706B\u79CD\u81EA\u6B64\u6C38\u4E0D\u7184\u706D\uFF0C\u5386\u53F2\u4E30\u7891\u4E0A\u5C06\u6C38\u8FDC\u94ED\u523B\u8FD9\u5148\u9A71\u8005\u7684\u540D\u5B57\uFF01"
--- !u!1 &2423690419254802813
GameObject:
m_ObjectHideFlags: 0
@@ -36995,6 +37074,7 @@ RectTransform:
- {fileID: 6805953989209425366}
- {fileID: 2729579121250304069}
- {fileID: 2161047130895777792}
+ - {fileID: 1774168000858424399}
- {fileID: 6349199766664341784}
m_Father: {fileID: 2338385386102721414}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -92502,6 +92582,82 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
+--- !u!1 &8959076514524919582
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1774168000858424399}
+ - component: {fileID: 4885833580203740449}
+ - component: {fileID: 2532233584909553488}
+ m_Layer: 5
+ m_Name: m_img_HuangJinShiDai
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!224 &1774168000858424399
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8959076514524919582}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children:
+ - {fileID: 185706832472226134}
+ m_Father: {fileID: 1508900408836313865}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 1.5, y: -731.71}
+ m_SizeDelta: {x: 1080, y: 876}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4885833580203740449
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8959076514524919582}
+ m_CullTransparentMesh: 1
+--- !u!114 &2532233584909553488
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8959076514524919582}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 5e428496bb88ea14daee9d8f86b60606, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
--- !u!1001 &1749071072740984990
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs
index 546eea28..951f052b 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs
@@ -68,6 +68,7 @@ namespace GameLogic
public const string AddGiftMessage = "AddGiftMessage";
public const string TtqEffectCreate = "TtqEffectCreate";
public const string SwitchTeamId = "SwitchTeamId";
+ public const string HuangJinGameEnd = "HuangJinGameEnd";
#endregion
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
index 1d00cfa5..78da0d4d 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs
@@ -659,6 +659,8 @@ namespace GameLogic
public int m_ShiJianTimerId = -1;
+ public bool isHuangJinShiDai = false; // 是否是黄金时代
+
///
/// 游戏朝代检查
@@ -692,6 +694,24 @@ namespace GameLogic
GameEvent.Send(EventConts.SwitchTeamId);
// 触发黄金时代,等待三十秒延迟
+ isHuangJinShiDai = true;
+
+ if (m_ShiJianTimerId != -1)
+ {
+ GameModule.Timer.RemoveTimer(m_ShiJianTimerId);
+ }
+
+ m_ShiJianTimerId = GameModule.Timer.AddTimer((e) =>
+ {
+ Log.Debug("触发黄金时代结束");
+ isHuangJinShiDai = false;
+ m_ShiJianTimerId = -1;
+
+ // 触发黄金时代结束
+ GameEvent.Send(EventConts.HuangJinGameEnd);
+
+
+ }, 30);
}
diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
index b467e7a8..1adecaae 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs
@@ -165,6 +165,7 @@ namespace GameLogic
GameEvent.AddEventListener(EventConts.TtqEffectCreate, TtqEffectCreateFunc);
GameEvent.AddEventListener(EventConts.AddPlayer, AddPlayerFunc);
GameEvent.AddEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
+ GameEvent.AddEventListener(EventConts.HuangJinGameEnd, HuangJinGameEndFunc);
GameEvent.AddEventListener(EventConts.AddGiftMessage, AddGiftMessageFunc);
}
@@ -176,9 +177,30 @@ namespace GameLogic
GameEvent.RemoveEventListener(EventConts.TtqEffectCreate, TtqEffectCreateFunc);
GameEvent.RemoveEventListener(EventConts.AddPlayer, AddPlayerFunc);
GameEvent.RemoveEventListener(EventConts.SwitchTeamId, SwitchTeamIdFunc);
+ GameEvent.RemoveEventListener(EventConts.HuangJinGameEnd, HuangJinGameEndFunc);
GameEvent.RemoveEventListener(EventConts.AddGiftMessage, AddGiftMessageFunc);
}
+
+ ///
+ /// 黄金时代结束
+ ///
+ private void HuangJinGameEndFunc()
+ {
+
+ int teamId = DataGameSceneManager.Instance.m_TeamId;
+
+ // 先播放视频
+ string videoName = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).VideoName;
+
+ m_video_Video.loopPointReached += (v) =>
+ {
+ // 弹个UI窗口
+
+ // 创建itme 实时更新进度条显示
+ };
+ }
+
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 4bb18440..fd8f3460 100644
--- a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs
+++ b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs
@@ -22,6 +22,8 @@ public sealed partial class TeamConfig : Luban.BeanBase
ScoreValue = _buf.ReadFloat();
ScoreTargetValue = _buf.ReadInt();
OneScoreTargetValue = _buf.ReadInt();
+ VideoName = _buf.ReadString();
+ TextInfo = _buf.ReadString();
}
public static TeamConfig DeserializeTeamConfig(ByteBuf _buf)
@@ -53,6 +55,14 @@ public sealed partial class TeamConfig : Luban.BeanBase
/// 个人算力形象要求
///
public readonly int OneScoreTargetValue;
+ ///
+ /// 触发视频名称
+ ///
+ public readonly string VideoName;
+ ///
+ /// 描述文字
+ ///
+ public readonly string TextInfo;
public const int __ID__ = -325757586;
public override int GetTypeId() => __ID__;
@@ -70,6 +80,8 @@ public sealed partial class TeamConfig : Luban.BeanBase
+ "ScoreValue:" + ScoreValue + ","
+ "ScoreTargetValue:" + ScoreTargetValue + ","
+ "OneScoreTargetValue:" + OneScoreTargetValue + ","
+ + "VideoName:" + VideoName + ","
+ + "TextInfo:" + TextInfo + ","
+ "}";
}
}