From 76e3c5ca457b5d6ca56c8d039dc486db5effd607 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Tue, 3 Jun 2025 21:54:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=BB=84=E9=87=91=E6=97=B6?= =?UTF-8?q?=E6=9C=9F=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/GameConfig/Datas/TeamConfig.xlsx | Bin 10772 -> 10989 bytes .../bytes/teamconfig_tbteamconfig.bytes | Bin 160 -> 1014 bytes .../Assets/AssetRaw/UI/UIGameBattle.prefab | 156 ++++++++++++++++++ .../HotFix/GameLogic/Common/EventConts.cs | 1 + .../GameLogic/Manager/DataGameSceneManager.cs | 20 +++ .../HotFix/GameLogic/UI/UIGameBattle.cs | 22 +++ .../GameConfig/teamConfig/TeamConfig.cs | 12 ++ 7 files changed, 211 insertions(+) diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index 6036b5053f66c2d4698bdfeae0715f7493812893..66e1236652128416549fdca371ee6d9e95986d52 100644 GIT binary patch delta 6921 zcmZu$WmFu@lEvNKof+KS0>RzgJ-7vz39dnAfDkM|fRNzs?iL&ZgFC?`xGZ_!?t5qV zZ2#!)Q`NU_pXxt-t5S82b*oZg5%X+DI%FW9VW~k%y<7xQr-*C$+a0R4)7;X~e2A$q ziGgMt`tTx=^E6ndwY}Y;bq=e4bo+5{)E8?wU0xT_+@h?^J5hn)D-2&{}Qd+MQk zDBNKNQP~gv?R^9y_IPMkf?(w@+KO-gF}JNp(TRg}P!sgry;IGi5}ZaSXv`vo*S zqSZDf$rvQVA(-&Apb6#I)DE78y+{v>k0)_dP`b!NooT2jgnT(2S_m@>`3~O4ytI;f z#UXPB1O-ulx$!?O8r7demKR?7xsQ>I6E5j!nW=Wld)8*!OM);z*YZ8^t1Xh+beL^O zAjDOUcWBCc8i^|31qtgXCVE7fkb*9Ba&QS)PO5txBz%$ra)7ESxb_tm`ovfTMfcg{ zXu99_grd87ya&k&$YmcNxdxK8x#ouSs7sZaEZD4ntc~-EA}uT}3`2n60W^7{g$6Rx z>x_W?zbO%Vn?Hw1E{s$@pIz-&k29DEdk5D-zRFXt6i}O$k$c6FMn*(EN6|9csA*kM z7VrN)Q_tE5I(nHOha>=!&rO%&d8a4q}u#=k4kOl-;4g}90?=s$ss)Y!+v{?Hi=99A7a zVrlO^oUef>UADIE@A0AxF?q{o8ZN=MS-k<`Ih_%uG~QdPO;I}_W;H#js5g+kfEL9b zixg}l_QQ`kIqml>G4qMp8(eo|6z4PAeAun$kKTk8yuylj9N`$}-#DiLy0uS6L5>}= zc+MW>EL8M;6?KzAtFFu)x_s)Jd?6#t{%t=-Cr9-CHQrQJc=2

d?-!D1>ylK6m$# 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 delta 6740 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 L1>u(dFYJE+Eq16A diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index cf3eed18d23e39ff11c746fba03abeb118b9cabc..64c81b375c59e6f448811a0c99df7ca388e6f9cf 100644 GIT binary patch literal 1014 zcmds#Pfo%>6vq8WS55FJC8IuyE{3~t21Sr;^2tsSBRTm7Dq_}Z~r(oX9 z)D2hgH7>*}Fsm=`d-KivWnOAu5|IPuQ09dvK5p>22c=@qwv|0R2NF6od`QF4h3N@gcNW&}0=0YJFzt%)G~oaVuob1k5(hhY566XU@xJQDE&d>lzsHJGUr%%pbCV zP}1NU7X2jC(7=47B;bQ4B{c{%Y(U)j+J{OgBKzMkRs;MFCLc=N2oh-i+=1GS7*}Jh zh0tHCm9jj~^mFpIu`AR^5_3FuJ4&-|pSv?LEsCgs)cHJ9mfvUduDosR3Ux}N(K8Kg dTyRg=J+O2}2vXzj=RUMM{BB(FKWA64e*n5Sq7(oC delta 21 dcmeyyzJPIp%tSeb$-<0^lR23bC;w+s0su?123G(8 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 + "," + "}"; } }