From b08c2f71c255f0dcee6af0f7f341e8aed05f4a8f Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 03:29:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86Bug?= =?UTF-8?q?=EF=BC=8C=E8=A1=A5=E5=85=A8=E5=8E=86=E5=8F=B2=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=BB=98=E8=AE=A4=E6=B5=8B=E8=AF=95=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/GameConfig/Datas/TeamConfig.xlsx | Bin 12906 -> 13032 bytes .../bytes/teamconfig_tbteamconfig.bytes | Bin 2076 -> 2116 bytes .../HotFix/GameLogic/Common/EventConts.cs | 1 + .../HotFix/GameLogic/UI/UIGameBattle.cs | 24 +++++++++++------- .../GameConfig/teamConfig/TeamConfig.cs | 6 +++++ 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index c3c38d89a5d1c3e46e779d53202ea111fba49e57..126b6b8a54d55056f2bb068151f520af6ec236f5 100644 GIT binary patch delta 8254 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 Ai~s-t delta 8134 zcmZX31yG$qv*m^0?(Xhzad&rjw?J?S4j=A*3GNW&;_eb8xFl$TTY#V;1eZ8hzSJx6vwZ5uOS;1xM0M`R#5FqDA$Fcn_(g<4Qd^drG)b9MPyDNm2* z1dbE$Cbr;OY!rW}Phg;9&k_d-=g!mNo(N-kLIg({XQR3vgA6Y<6D%!D^)!bJ=O|0R zT-xt-MRR=wZg034g8M&uEbkatP)SXeEc;*y;nO`-7m2?ITJR(mtVaCcKt{%mUz>b) zKKunZcb^$W+=3~@;vORr&06VKM`T+di zAGEYtf!bkJ#tpDZe7|5hraJnk3deN&?~ZUl{MNF@+(uOs_gOt$vFL|zWYl#7{w+2g zQQ`I))~??tjR$qG_wLgdANA#h+}48P0YrJ&`j(3vsZs ze1Jje+p@M_L*$u!i1Cgz`lu5waJnrHW!~O==_hY6z*y8&#vPOl2^q z<=XHkM7W&&^d>!dNjfH*Dn4gs%Yqa7jYgajpSuSaUZU~~3y;t5?NL;t5WT%0u2;kk zPZ|y@b}(I+piS?GU32w=>FVhNcEM%l?JV}ec69yj^neu=g_CeVA5dyg*A2!QaN*sf zOnkW!7$(gOZs~eQq>hIDb0+N$y2l%xK4I^_RCPQPxy1F;!KnQ-_k6piFWs5nS*D@0 z;N6lfw6c=ZXkjKGUxBE3i!r*b*EusOU(dXT_O0k*~oIxy2hqzF|y~+c4hA}$jib~ z=Qo!rBqE!R@_+8lKu_Sg%l54c*zNaSMAyvRlIfggKnIKAaWcl*vOL-viFPD9;p@Gq zznyz`NlTw0sWN8i)ud|v&b!1=s6)6JgyD2W-!iTg;2yhv!n@X>9s!+K#>Ozt@NRFj~!S)s|$nx#>>sX>D~8++!o zvJpZ0tBma85jy$`Ca_u@vGTNbsbrjxG9ELawHw*|T@cK~HZX#GTGvmVr2}i8<}NiP zhnz*%%d*3V+@O*@!Q`j%tQsn@#XxK)YLB3eD<8g)YN130`?q0 z+=P2im4UqZVepjI=!;4(cZBXo_+9{1x!7=}EnH#x6 zKW&RATCrUl?u8hPTBNYFfUq>1ur$>$M!dvpBnp2lqG(jKxA4)`u)`YLl49E-i@}#)vMk## z0n$&4smm8zNXdV?1OQuNyDw@PvhmK9U6QobSst9`;kDhOhZFIIv9^_5AXaP9wp0j} zoB;VpYCVH(5=YH69D2_9-jCS^IiZkFHB7UE0#|k(|KJRwG&wSVU0dAo>Lf?&Wx;>Q zMm%-JKB9Ilrl!=zH(bFGS2fl{V3{p2B$;_C%wAfRdIV2Kb;9Oyr|9S58(nwqQ{<%E z5d$52p5elAM0*`1@F&4 zqO;St)c!<|{m{XfP1#_Tn@QP{ss3FyjTTrixLhPG!NL+iLtM4*t8;iL2gF}$n3uy7 z;tW)Lu=47JDSy$5?rTMT_s>;u*!7hwH28_04A{`*ImN$yZ^onFzWj5wLub_hZpwlr zv$e$k_L8ZHBKJ@OUG~l9aNVXWk>+@d-e!u$7f4%=z?r_KT@C%RkMaYxRZB5;cz-@AhIj#E1ABBQSPT<+U z=5gobyicS~VC}4D>pkUGSZ&LzN8l}FR)bU64X_0d1b^)shzkR{O}2aog585Irh}c31l?674F&cJqMQkyT6I8JNCWo-p#H-0MVEqci&u3w!MBNlR}@5 z;KMJ^*<2KSdty>jqxW9>gF5baUTtKx1;aip&l@C$yEa&7|FN%)CtUUe7Yy=M&RF30 z5H&QL5#W0adtNrLzqZG3u@U+8eT58~w>TRmzrwq=bY`Kyt;2RYGF-`;+1g{o5p*+Y zkF#Lxlu#y$6JT3wdcWYYu!k_!qctzV93lsPkbr2xkw7R}5L=!xND+_^R~21Z5I`UX z2sJ(xpnw1bIr)f`TS7Y|&;DoUv0{ z-{>=bsr*!ijoroU=gOG9q9Ch|iNCj~_l#mGz-13GjNc&6rbv){up5o`mGhq#uVeDE z5F)!8Y2`XezfklFk7Z1upQ}~*WFe-5;Xg~;$#CE(rD^|`%r_=R!fU#Fy>x@0dM05q z`}yV2XRY_>#m@XLm-IZ?(KmV0^{{G}j3i+9Dp45kuquLhwF7Y=WRUX8t(~!+m@RPR zFS$=vSL8__`;qhTcV+QpX8GutoNqiFaVWQCqjJV>?Ln1h6h;nt3gUfZ&UFv)=Rzk0 z^q4%t#&LL+c?N^rueTG7A`>E5OzL0wScBXRH}!8|EV1|Fqz0b^sr@4r>T~WX{P5nM z?3YaO&@;W68z77t@bcd;#4EpeC^pCkwv?|L!VgJ*HF@XZjoxeeLD8Bq(V6FdJiPNx zP<8_u{n{43F{YeTtQTJ?DPd0Gl~_4h`+RHyLr5t` zm3U{I^#kg74Wiw#7KxH#0_LV=IEDUrq-^rYa1#9yX0Ma6C9UWF;g}nE`;gNG$jsx| zb2!-H7!uC>(HlIWaVmk~%bUS-__mq77^vz6Hs+KZ+zLckv6|{p4_|TPC`&AY@E*~} z?)%drMJmz%GB#^YM^6`qbwRi3)5lE}C6LN*Eb*XgooaR zP`ugCb7ga-gBc7aArh(aJ5w29Hb2-Ah>*JyIsCa(ipPSO~$J znh`n9aE(SO&!)%Un784Lea17I_QPt;iZ(CFi7Zhl#*sxFnKkB+?hFeBHd!k8-bQqP zZI-tgXjpNkfFinAe;pM~zpdZvZ{g54`oidFi|{zcMg}{+3oxUB5l7^j~|2x`Nsyvi&(KoI*`%%2RKmJteCz3*;?h=Oi@-Ku%%qESWCbHjWW>`lO zzyn5%VPp{vQRFU>*qrg1Kmc+$p&`h=qj!oZexnT#BEAkXW_Gomcz=EL3e1Nq7O!Z7By)guLVy{NXs!f z7yQOppFz)3VY#{{VK!VOFB6B6iBPVaG*mrhwzw7kqghR8bMCgWrGCnE!g!y^ZIl9* znSy8*1kyC8vF75DQK_Ac{L|gguS@u$g;%qocPTqk?Wt{hf%8SH8uTm;W(znqYc{-7p@6q=OH9u=Zl?E?6~BsU6?`Oj}nf;WH*mI3H8?tKQlx699w9g zX%G6v_f8~r#$-(|mMkK(V_C&7s^0SEHZU7qEP1At(w75%)%^W6(^05>Y|Wgtcd5BMWQcH#Q8*#%7@s-@ZZu!&dCnd9R04;8yj8Fm@Nt= zu;h;XsI3;7I<2g2)3uFm^-!^0`dJz1*^RZOMVhr!iiNV;=KX+&g6-UOkw(bS&GC3? zk>|eWa`D9@XeV!z?K?+e|YUjFN0s zTmP!O^^oi+gV%@W&)K?Q5LjFeY4E!UPj1flP2n}LLvoqpd5@`Zidr(JecTRwpZ&OY zQX)ViL)*G+2}9Z(bd+avoP2vD&saJ~Q~W^X>glAJJ;ZHlcME%MPxX-L_$U^UzgVXm z0bf^4{Y2hl?kwEz!luK@mzn8C;t|xuyH59hU4^x4v-7yf5v|g^>5eNQ*FIduyh`q~ z6L0d)uq-kT{;imz>i->NKhVA1 z4-^o{S|0>L{~LNgXHG9~e`h-{4nG&?B~z1>wa@rK2E_+lPEJIQd|nFOw5o5nM$ z7*Fps8XsO4p^_=5rPgBpqwkODr1k!gdEZEpOo8SNDYFa#daXtTmkt}ufcL)`I}(#} znG%BluX!-JujSIHj1!&t*8RC}yTVI}&Bl5Mn+1pNw8PzF-9HC z)7STX{l~)w4F)9WVpFGySXx`m%;~z!f7Al05Xjme&O}uoDsB^gxtE>Y#8kL-IFH?6 zf;qL0Iy%hH&`sx@g^GWMRVw7~cqYH!at%BO#?Kz|2BG^tJw9u>3!3#Aq9@5oy=4g^ zYY`q>M~}26XUT{mW{bNf(w9>;FE`H} zpX*;I}Xou@q{?isNI zggif3)3(vQ3fVQ?(wut@MEg{{^h@Sw6Kxcn)r(L`>D$I~cek{N1(zcdbAwaD!Ge->$LP>Gf9rs0JhEp_P2-q2Y5Q4f zCAmDF9?7Inqwc0m<#E4z7n0vASSa=i>|W2^Y7D%9j^}^)K|I!py0UO9R{hg$iMnb( zam*&`Mh}wsHDq!c3&C?VVuaB$@_M2;eL1h)L7J~J@bcH5O$f-#ls_;e>V<~Ac*cpQ z_#fEit(49T*V}Zbs`xO_CVARtJ7lrBz_94a@ImhbQh!G#akGyg<5Y2AGX91Il1P^} z=zowa6o0UL5dE{cY2YJ)g!!3Iy}X0$RRvjVo%Wz!rpH8YDe zw$admrSWbpd7viEjwld4_}ecO9`e0_IQNuMr2ZuPp0DhZ z8!xb;R8g~wl>fe|q3Sp0Seb0DcerZSq0bng;hEYE7*?IIP|0S#cS7c&0H`=6@>rcP zc<2FktBU;w`spS5m6FDVs(PX6jHkB9ob-WAuDy@x2XA@UW*gf0b*@%$?3G`Phk8q? zL8msgeE+QleB#*!9-T`?BEq6`_rZ(N&In2%Rs8JerRG^tDvT>6`TOCwj^!VXAq4%tVi zmP_M|#FLuE(#FfOqBZKAbE1_?o0E^Hs!YNgHF7!av=NNM+5;!jji&0Lay$Mwo2J__ z%vFM{EGK5{Pl3@^2}jpR4yRRIE4c0pU3eCP(z>h)VytA=JoEFa`Uk!xjbV@o6M4>m zRDU-}OwyVFq+mo8s~FN?az=PaU&23q#&W!~l_U6Ii4ikf0<#Xj*d|4y+9L6@mFeGd zKiw>L`vT|YSMSyq9JH$ddoWXlER3|j=Hfk4f{v%}&aqRRr;AVdwG#(AG!7QQ8+B(9 z=l7=1hweZW4W#v0@Ub24tBFQl$M!;|uF!%^lgd+orl0$zywUU%tQFv;jj$diU&PGq zdX~{KRp0hVjD#!Z+E+7h(UA5s{sNJ{U48cFD%Hye1j#9yb?)F{PY+g|YWOU=Hk5K2 zsHG?;Yc4(8wkxDV+tdBOi zumSP%@2PZOVT?>v$?e{agRrT={JzTqmXqj8*&%_ly_(^s(vj&$hQiA@RGuepo~+HdANWl0DJ3}W6s zqCn}%Jw7(J#e8Z03!m()oG{D&0q(D%WeWMJzre5?RVS91`4_xLmi~9A@b1s=P8xBW z-k9y%)f>KDp7k5PJH=C5(TGQ~q@S^h92g3`r6rSoa+}AN5}5od0TAqMiguCCXp<+b zi9I9N-tJ~s(5`D7ts)T?Y-jN(DK6wF#(Il4!0i{ikJ99HYGuHFh_Jy#70dsD*|^L0 zQamSn+Ee(H6$n)T=WQ=98AHNRYrkH^A3;rkqy9-N#a1oZRk2mq)GwT9- z{upTSlWd=sYxOC`Bhb|h-`h6itki-g|I_&eH9(Vet#sjisS! zFWmL1uUWomuyEiLhn%H5}8~arL&4Q!cQ$; zhanl!u%h(bvipnY1xyQ7;Fc*pqJlD#!B0fVTawfB*1%#m*`iQfRQ&#K!zi6X4Gl>w zB$Jle>)~Rch@y`YS=Po|8Z>nhI!rfuIop{N)+~$a*_0s(#tYSN*CcAtwBM znt}~)-d(BK37i*+y^v+(Z3a&(%LMvmbaE3?h6z%iM}4Uvk%Jp%Np_*e=0(TBrO304 z?X*IT+kJ{Sj3%aWU6-bDAW^pd1w*Tw9MD2YseV3o1j2O?;<{F+778FxvBHL_kr7Sb z8z>}`NK`UZl}wqT&It+eeaKRPAPy9*4+uP8=VfP(0#QTgx}bX@V_rz{?nig8fQN>% z=kdb$eGjt)I~u3H4i}VHh$UW4tjxDS-qFp~MGgezpor zl+RzH0UP!FEEH5WKNrLpDX4)pzaNDf2)B2X897_G0gK-mDEEA9{#SFCqc%Sn_Ml+( z7<=PtN#y=3=O_M9^l0tms58_6iIkv=g|MsIoZ8uN|DEZ+XCuySElYxtU*L{Wqx5QH zb`b(;Q7SnAAH`-5UN zOk=P|Be298iGCNuAD>{FYyh$@F$l$<2~GI+&nq_jDbwkSfT%{RG?O3yrI@hJEze=( z9bVFxvdI`v`4~HP6WWlx#5a}~h|c=mq=EY4X3*E^9BT*7uj;6z~z4G;V3?aXLz;;RE2)q&O`$ zgj3so_igKbRSCGn(f1pdS#Fod=tWpUO+x=Lpme?@_fw@Qy1nAGRi55s0sHU z4h`u8lR=ocFkoYtA%a|du=UIkH!e1^|C67?1cClNwEhVUi0Usc;XyjM7)bwLI{rTj zERZ`cVVFt?511cz76U?wi4O?{W0C&nkp=?-ZM^}3{u=#{{Fg;Aqy{Vs;{iDWi@<(m zffTY5Kt#A%VBuK*R_P&$+*oA)^H~f65&d6t3*aE#a3lnpD)4`ki69W}-;(=xW8Lik GTK@}4XG53( diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index 6963baf35b81a00af8b4c8748153cf74bf6137c3..c04bef1a9645daf630c3d926b5cdd4e3596028ba 100644 GIT binary patch delta 80 zcmbOua718&EC+i=R&iE*W${MYX^c=#ddlX_jF%a?AX4Qy4NE7=OKe`iycVXQB4x8L Ot1FyWv3U|(7b5^{U>n&0 delta 37 vcmV+=0NVe=5S$Q@9Rh%#lb{0_u|IqPv%>+?0kfV1#{si#1w{d~x(12?4fqY( diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs index a5c6baa3..9b4dc4ea 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs @@ -31,6 +31,7 @@ namespace GameLogic public static int GmActorId = 1; public static int HuangJinShiDaiEnd = 5; // 黄金时代结束时间 + public static int LiShiShiJianEnd = 5; // 历史事件结束时间 // 测试玩家头像Url diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index a8a7521b..27db6aad 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -204,10 +204,13 @@ namespace GameLogic } }); + + var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get( + DataGameSceneManager.Instance.m_TeamId); + // 设置用户信息 m_textHuangJinInfo.text = string.Format( - ConfigSystem.Instance.Tables.TbTeamConfig.Get( - DataGameSceneManager.Instance.m_TeamId).TextInfo, + config.TextInfo, DataGameSceneManager.Instance.sjDatas[0] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[0].name, DataGameSceneManager.Instance.sjDatas[1] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[1].name, DataGameSceneManager.Instance.sjDatas[2] == null ? "暂无" : DataGameSceneManager.Instance.sjDatas[2].name @@ -215,8 +218,7 @@ namespace GameLogic // 设置图片从透明到不透明 - m_img_HuangJinShiDai.color = new Color(1, 1, 1, 0); - m_img_HuangJinShiDai.CrossFadeAlpha(1, 1f, false); + m_img_HuangJinShiDai.sprite = GameModule.Resource.LoadAsset(config.ImgName); DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 @@ -224,8 +226,9 @@ namespace GameLogic // 等待五秒钟后关闭 UniTask.Delay(5000).ContinueWith(() => { - m_img_HuangJinShiDai.CrossFadeAlpha(0, 1f, false); + m_img_HuangJinShiDai.gameObject.SetActive(false); + m_rect_ShiJian.gameObject.SetActive(false); }); } @@ -313,12 +316,15 @@ namespace GameLogic } }); + m_img_HuangJinShiDai.gameObject.SetActive(true); + var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId); + // 设置用户信息 m_textHuangJinInfo.text = ConfigSystem.Instance.Tables.TbTeamConfig.Get(teamId).LoswerInfo; // 设置图片从透明到不透明 - m_img_HuangJinShiDai.color = new Color(1, 1, 1, 0); - m_img_HuangJinShiDai.CrossFadeAlpha(1, 1f, false); + m_img_HuangJinShiDai.sprite = GameModule.Resource.LoadAsset(config.ImgName); + DataGameSceneManager.Instance.sjDatas.Clear(); // 清空数据 @@ -326,12 +332,12 @@ namespace GameLogic // 等待五秒钟后关闭 UniTask.Delay(5000).ContinueWith(() => { - m_img_HuangJinShiDai.CrossFadeAlpha(0, 1f, false); m_img_HuangJinShiDai.gameObject.SetActive(false); + m_rect_ShiJian.gameObject.SetActive(false); }); - }, 30); + }, EventConts.LiShiShiJianEnd); } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs index 54eb8893..6427da10 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/teamConfig/TeamConfig.cs @@ -23,6 +23,7 @@ public sealed partial class TeamConfig : Luban.BeanBase ScoreTargetValue = _buf.ReadInt(); OneScoreTargetValue = _buf.ReadInt(); VideoName = _buf.ReadString(); + ImgName = _buf.ReadString(); LoswerInfo = _buf.ReadString(); TextInfo = _buf.ReadString(); } @@ -61,6 +62,10 @@ public sealed partial class TeamConfig : Luban.BeanBase /// public readonly string VideoName; /// + /// 图片名称 + /// + public readonly string ImgName; + /// /// 描述文字 /// public readonly string LoswerInfo; @@ -86,6 +91,7 @@ public sealed partial class TeamConfig : Luban.BeanBase + "ScoreTargetValue:" + ScoreTargetValue + "," + "OneScoreTargetValue:" + OneScoreTargetValue + "," + "VideoName:" + VideoName + "," + + "ImgName:" + ImgName + "," + "LoswerInfo:" + LoswerInfo + "," + "TextInfo:" + TextInfo + "," + "}";