From fff0ad4754a72cae9eb579677b73d3a2eff06a72 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Wed, 4 Jun 2025 21:58:02 +0800 Subject: [PATCH] 1 --- Configs/GameConfig/Datas/TeamConfig.xlsx | Bin 13023 -> 13014 bytes .../bytes/teamconfig_tbteamconfig.bytes | Bin 2159 -> 2159 bytes .../HotFix/GameLogic/UI/UIGameBattle.cs | 9 ++++++--- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index 4db175de72c2b678b80174c6566f901d804c3de3..073cfe1f340bb6583577c406b04ecb39ebf3ae17 100644 GIT binary patch delta 3008 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 APXGV_ delta 2989 zcmV;e3sUsfW#476lmP_yWi@`2m;oPu(MrQG6o&5w-=XBbP1Cutg|d((ES9g3I9`OlZ{9Fi`NstmrsSXt=|ktjw1XkH1a_ZfOA*5Mol)-f$u zS!u}72`pOXw>K%TDX$D{O;v+&5^Uf}+EQL;=-^yUF}C~wirL5~v@h-|qnPu5N3+K@ z;~#7fIEmvKR^XUmj^P#<)&mipk%AA%`qPvhKyVBtDA3Mg5)u59bzqeJv!Sbul1jQ$ z?Pogcj@g3u#UXvPatJm}6E%}g!}}Bbwt0H)Mh&HIcf|qaso<0wV6HOxc9r7Mv0Yus ztlRi4?<9zaQ+_X$)Y3ZB=2QGdJK%Ahea{3Dcpuu^Un;MY)nlPVWSmPAJ5j8(%~ZDH_{W$R=_!AqXR*L8_5&>0tsl&zvuD3uobTJ^0^rzt*Xy;& zHQj0%W@9|6#rmQVy-_i%Mq_O}x^y9XZa5lgf7#_mwOlhB`grt)-ip3A@!Q{wZJO5A z*1E3S5kzRT#-r=D-5ia_Ta|UaUT($Arrtoys%h2BHvY8M;;p8om#a>vdM%#l>l=*M z%SI#0BaB*a6T@6xH7a_>tZdZvhRuUmdaZ0@{;hSR+47=YufA2hs#V^^wR-dMO)rF_vWt`2;&DdtM6{|GdS@;anhT^)N-e}ooJyW*J(TOo914S!7F;+F;B1?V5(pSf$ zDQz@W&<3JtaWu<@zS;8Oh+V$2sMqw0f2~(hEYXN*TF=kv0>c`#$vQ8xxtw>d0EpOE9v{_p*s`mPL zbR_C==grNWZmg}_m|cG?;ao|@tRV#ckJJrT;?YRGeBJrnbi2nAP(~__MQ%uqf6Yhq zNw|IR>Gm0n4V~U4>2|@V+a-bCr;O3>cEG3GK}*Dv!%6w?)b5xKzbuvneqGvdOq0En zn8_)_Yu+_7@OCrSylZ5@8#DPXV|v%D{f`%oQgyEyz?;EPZ1}BR(+0f&0Nzz&$2-la zA+HO7H|81MA|g)?fZJt2^(iz!f1H=Dvntrqofxys%?P$NYK(wY(E@vIqHipI4NI)zDkg&pO;x0WiiE1j1QkhD!L|oX%|DNRRgn!U z22{m#P%)?~azVwAs>lZw!>VE?s2EWdvq6PMOr7&2Y$IWLn5RU65(|_lE>fbz3C-Cq zov7zshHqGGoJE&OI9nKFF383u36~{Yk?^8~mn6I_VG8x+T~Z2@@CPz~{WVI`I_W9A zG1HXDP-2P_SxQV(B1eflC1xlwONlv3%u}L3i3Lg&DN*8tzW_NiB$BY`N__Pv;gW>Q z60S&iQNl|SUY0PG@?m7d%R>r@5EwZS81@Sc=LLr80>f{CVYR?;Szs6}FuWBQwh9bK zftC70EusG4$y@E!T#c`PL$OzDWGkKwk&wMO9U>u{apr8vREUIb*dY=!m+7-5xey7N zZvJe^%-NFJvn6w$#7pTsB?^>S;KZP)f+AIvIDuo57xlc$^b2OuWn?j3kn$x7mnB@0 z@S=p5B)lwPD&@l{A#Wln)QZ3;3W1S*fwMl0dS;DoOxsiMRQe@(iKuO?l_SCg`F zNy23bS0ubB;Ux(#OPEUeFcRdsnnG>_Mp^`h{{q8$f#JHqFkE1GEih~r7!C^za|MR4 z0>e^Zr6zHY@eU^muEwf=mOD8)h)#w`$VoIEA|Xf7Oi+>_XO^iD3HesZhDhj69wH&z zbS^|fzB2M560%ljLL_7*&Ymrq^CVtM=P6O3!~!SeQKm>0C8{`26^op}U9>mu1^yI* z9mJO;T$XS}!iy4KlJK&Gsgw_+fV@Fcs1$)w5&|Rl0wc)+Px~-`(k6K1M_?pEU^p%? ztQ8op3JgPml{JIgYUg3hV2t^~Z%z}V+OT(XIyvavkdkUlqnlVZ39@W5N+Ve?Q*OK% zDc-Eh_u-#wbdmfUFr<&{RVCTGxytpa!Z;wqA4*x3*XaiPE^(%>Q`N}S+N?D*}V zpHVV_rxk${=;^6{8FErXj7%eryeQI`Q5wnSFva6(F|s3MIiCzk%^O>C%0MJwUTLJ8 z3mR!^=;jh4AvIXw5}BF>-=;y^N}TX#$tfhX^m{A%@6;JVaT8yMN%lYAuEWNQMrwl~Wo>v;l zDwshd%@Uc=Y>0$ZT!Bk`SsIa9qHQHk__O3^lq}&P#Tj2dP_V^A%uTb7A}<4^ZZm2t zDcmVHBq`Q^tV?SwF(lyhDQ!7*FcLMdwvy_fVXY)R1Ek1i!!*Q>f~%1UDh8O6%lPx6 zP-6H0y-NczqKX^lU*lmpELm_mRl2AGn|D3fs?iaN2?$*{*&?o)IB$z+bb2!VZa zHiZCF3@{~^QO0&3h=q*JZu-NF;12`j&>7sPsgs$1a~Zi-3IRD!pB~i|U5$)Wav5cMyj$4xBYp&zVKeAV-J=Y9?Wt;t z0jA_K`0&oW=M{>($6sUe7dCa>T611_wjvdCqk&x|fh|X{{IzRI8^vRMgrt0O6c38n zkyxhii)oqt!Ax!V?5e<^zG}d2fy$8!|Sbw z3}_5={=CO`+&)dBZp7(CwY`@s) z-1@fn;3j0D=4t-2Z3$@Syj_!}j5w&cO}@$FClp{AIthdvyHjuXN52?soP+!RXk(O|xbjP5!2T zy@lT;Tqzq@^;pYvUe#C4N_=oI(bqq$of{lZ_9uphV(WIj#>^J}a!=V&B;3F)f3iDD|3kN^EOd_k}F%bo70&$tnt-M@7|KIq*2SNr9w zlkNSJ?c3eG@49zB?LOM-9qqQCe|~&_^X19kpFnf`c&~l<8FR-8)w%x^L3nqTwpX`$ zNB5D2YNLNf7 zKR59HTF0+Gblm>-#jw?^nx^gj0k>J)Mcv+LMw(^R^`h}R{Ky1f>854i_Z`j|&pO7V zP1CZivSB;vae`%?C~Rqn-=R$W7myya?G9rf0hg0eE00000mQu`y diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index 33e226e82cc67469a64f9539b4ad82306246813c..eec1df1487dc98783377757e7724938e9441b00f 100644 GIT binary patch delta 32 qcmV+*0N?-b5bqGMp92EwV6&kE(*Xj8ptE)bPXPnMN$|7C2B!h&gbkGd delta 32 ocmaDa@LpiUd}gM@0h<>xUuI;oXxLoF>d(l0ux-KS6Ku;F0o-p4+yDRo diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index 7b9f524b..b72a0c25 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -212,8 +212,13 @@ namespace GameLogic DataGameSceneManager.Instance.isLiShiShiJian = false; // 重置 + var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get( + DataGameSceneManager.Instance.m_TeamId); + + // 触发历史事件条件 m_img_HuangJinShiDai.gameObject.SetActive(true); + m_tmp_ShiJian.text = config.ImgName; // 设置用户信息显示 DataGameSceneManager.Instance.sjDatas.Sort((a, b) => @@ -229,9 +234,7 @@ namespace GameLogic }); - var config = ConfigSystem.Instance.Tables.TbTeamConfig.Get( - DataGameSceneManager.Instance.m_TeamId); - + // 设置用户信息 m_textHuangJinInfo.text = string.Format( config.TextInfo,