From b6b52a783982fab247696b73f57e2e9ff875b4e0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-SAJ6RKV\\Administrator" Date: Fri, 9 May 2025 16:41:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=BD=A2=E8=B1=A1=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/GameConfig/Datas/TeamConfig.xlsx | Bin 10759 -> 10772 bytes .../bytes/teamconfig_tbteamconfig.bytes | Bin 155 -> 160 bytes .../HotFix/GameLogic/Actor/ActorHItem.cs | 37 +++++++++++++++++- .../HotFix/GameLogic/UI/UIGameBattle.cs | 2 + .../ProjectSettings/ProjectSettings.asset | 12 +++--- 5 files changed, 43 insertions(+), 8 deletions(-) diff --git a/Configs/GameConfig/Datas/TeamConfig.xlsx b/Configs/GameConfig/Datas/TeamConfig.xlsx index 29f75cdfe2aeac18a1532678b09dc68ee1cd2352..6036b5053f66c2d4698bdfeae0715f7493812893 100644 GIT binary patch delta 2479 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 delta 2442 zcmV;533c|AREJcslmP{s3FoIrlbHc4f3|CBB}v&jdbL7f9UHq7J#A&t1a(XM_A^PF zrECnmIiBCo&x7gWsEgRv(M1Wb`{T1M!h7R6W3}Yt_pt(yz!i46ow3_=++C8qg_~3iMBSNNFe}m_e zdyX4mT=hhBMoQ5mt4~|B04XpOpuu>DX+rT&)`QjV&jW2|kkrbbs_>?>?vO1-*X+|r zr}|)B*GWBYHG)6IZ|kS$_NlQl&8!5VJe7h83*47B-z-x+D4Wq0-1&8w@=k$#IOX?J zE2EsZO+LlH0|D3CcTA8`@L`?(I;HbEUOsMDC?63ziODo3lP#SwI%kBuH}_wiZ~VFq zeYW_QI10qD=36pj<{xtW-cFp*Y=_XtWFb2YVSh7;13sO^8QYNV`TDuCER|GFv+w|yTcuLzR!QDY ze*9W3D{oV{5bvluaj+@ z{7hfMFsmTKI&C^HS++T@R@2#kOSlSBH{OJ6SQc@z3NrkgJXh0A5(e{p&}vz&*J}IK zRS>Nm8R0njOpJK3h-P6sp1rQZbtZ!(;WEgOfBF(_QWfpj{8RDfNwCFQRX#?FZE4Z* zyuDI>t7w+QX}rkXS-h&s)XJ+osvcSET+K>>c8IkKlAo`eZwS1>;+~>^Wt9ESm#Y#A zGm5j_Zr$xBb!Y1$3qv69pc-ba*EEY)?H~)B)04acmr3>XWFA39QTj>}E}D+-9s5J? zy8}z^a~p-*)WDT2c$$XGaF&I0G>cOaP4E=QKZRo-R82(B9YoAvmPK!2D_ky{&N;l( zfAd)YF+o+&U}7~}H*cGN%cL?77s2Z?YsJgEXr8?^og+taSMjzNM$a!9QrUCsdD^ph zi4gc*Sw*6soyscsB~vYiyLEV0X1N|k$UGlCre2J}->n?8?;gBAq)`mP-(pA|qu-fh zuNZ*8#Q?AFHVzx~^X_nDlP?Q+r z-I{L%u{BRml6YIeu_g9O{#)iLH-n@%fjDcu@NAD(*`scMd$h|Q4cntr_SmyMx@C{=wnu(SG#zs-`?g0<#lR7gFTc-;0Vjr> z7;$3EiHRik#X*(Nav_NWOiQ$$qcir|#sHNhK#w*>D9-V=Nv_(;%4)m3gj z>Z>s-sWED%F{-06>Y%YajAbK1Tg^jOjiIQ<5EHnHM%CSaioN-TZk66f0t z6Kzg(IML@P4I@`Ex|j2 z_XHmZJ`(hO1D_cfqAUG<=&doN))*>l41qOBV<@XJMAaC20$bgMo5?R+SEV=hralin zc7t|*w!?+pp|y6nuv@hD4i|Qh*4g304(IL;7k()2aAC)DPq`==`GAd1_@3HUK6|_cuVk(;61?yf{z4!-@vG{Qo~0%HAdYuMu9X& zB{V)aFtpV?WYrjoY78-ft)|^a)5>R*`Y|4Vhtw0ue*Rp-j=L6|b+^{pRkLjw*~m^2 z&t+#{SMn^>Io*Ht2=+y)O^225?eE}4Y_SZwlTL&Bw=c1GL~k4 z`gy(l9BgTJm}|yX-oj|oj4i)y8QDSCk?}m2oo?M?o*kOe0nj7Z$0W99WE*nZh-_nS zn@Gac%w#Oh@RH|GchQz+N4aK9mKH{nW^DOw%gB!Pj*REI>@4p}et(B%bnx~F_A!aA z8QF&1HX_@Y+a{7QH8UAYGx5G_*VzSsUTj9z9xdTcDzOE(Z7aKOb&8N|3wI0J6Ed;= z*cSn9Nx-NBXIQe14C}aLofM3zi$&SOh<6?GP;VHAdP}_Dvr=kuHCr?c{@jwwsTMOUZDd+nIRB zc!`OeIo~+OGd}pLHsA}&CU_3VLGm1})5sedquh&v6l*G**;Y{Fz3{fBRgIFaKd!sopFD_+wS*~Cef1W_ik zlEJ!p6p^I1R9h6DG&zg IB>(^b0HgAk82|tP diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/teamconfig_tbteamconfig.bytes index 803a0d7ac7263f3572a1aed0261597ac7de31073..cf3eed18d23e39ff11c746fba03abeb118b9cabc 100644 GIT binary patch delta 28 kcmbQuxPWnj6;t<)iPrK=^BpEe%QNkoF|k^n`9P@w0FOip3jhEB delta 23 ZcmZ3$IGb^T6(hq$8+jlR3nJ=(1OP^@1v3Bu diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 98665fbd..a423058f 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -38,6 +38,7 @@ namespace GameLogic private double m_AllPush = 0; // 当前总值 private int m_AllAddPush = 0;//永久增加推力值 + private int textureId = 0; private Dictionary> m_Buffs = new Dictionary>(); //自身Buff列表 @@ -69,7 +70,7 @@ namespace GameLogic m_tmpAllValue.text = m_AllPush.ToString(); // 播放序列图,通过Gpu的形式 - LoadTextureMatRes(1); + LoadTextureMatRes(textureId + 1); } @@ -154,6 +155,33 @@ namespace GameLogic } m_AllPush += m_AddPush; + + // 检测个人赛道推力值是否到达可以切换形象 + SwitchActor(); + } + + private void SwitchActor() + { + int id = 0; + for (int i = 0; i < ConfigSystem.Instance.Tables.TbTeamConfig.DataList.Count; i++) + { + if (m_AllPush >= ConfigSystem.Instance.Tables.TbTeamConfig.DataList[i].OneScoreTargetValue) + { + id = i; + } + else + { + break; + } + } + + // 选出当前朝代Id + if (id != textureId) + { + // 切换朝代 + textureId = id; + LoadTextureMatRes(textureId + 1); + } } private void RefreshUI() @@ -330,7 +358,12 @@ namespace GameLogic /// private void LoadTextureMatRes(int key) { - //m_ImgSprite.material = GameModule.Resource.LoadAsset("0" + key); + // 先隐藏其他 + for (int i = 1; i < m_rectCar.childCount; i++) + { + m_rectCar.transform.GetChild(i).gameObject.SetActive(false); + } + m_rectCar.transform.GetChild(key).gameObject.SetActive(true); } diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs index f2706385..a333e141 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/UI/UIGameBattle.cs @@ -174,6 +174,8 @@ namespace GameLogic } m_rectBgList.GetChild(teamId).gameObject.SetActive(true); + + // 替换UI图 } private void AddPlayerFunc(UnitPlayerData unitPlayerData) diff --git a/UnityProject/ProjectSettings/ProjectSettings.asset b/UnityProject/ProjectSettings/ProjectSettings.asset index 6da5fc6a..dda10aab 100644 --- a/UnityProject/ProjectSettings/ProjectSettings.asset +++ b/UnityProject/ProjectSettings/ProjectSettings.asset @@ -761,20 +761,20 @@ PlayerSettings: webGLMemoryGeometricGrowthCap: 96 webGLPowerPreference: 2 scriptingDefineSymbols: - Android: ENABLE_LOG;TextMeshPro;ENABLE_HYBRIDCLR + Android: TextMeshPro;ENABLE_HYBRIDCLR;ENABLE_LOG EmbeddedLinux: TextMeshPro GameCoreXboxOne: TextMeshPro Nintendo Switch: TextMeshPro PS4: TextMeshPro - PS5: TextMeshPro;ENABLE_HYBRIDCLR + PS5: TextMeshPro;ENABLE_HYBRIDCLR;ENABLE_LOG QNX: TextMeshPro Stadia: TextMeshPro - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_LOG;TextMeshPro;ENABLE_HYBRIDCLR;AMPLIFY_SHADER_EDITOR + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;TextMeshPro;ENABLE_HYBRIDCLR;AMPLIFY_SHADER_EDITOR;ENABLE_LOG VisionOS: TextMeshPro - WebGL: ENABLE_LOG;TextMeshPro;ENABLE_HYBRIDCLR - Windows Store Apps: ENABLE_LOG;ENABLE_HYBRIDCLR + WebGL: TextMeshPro;ENABLE_HYBRIDCLR;ENABLE_LOG + Windows Store Apps: ENABLE_HYBRIDCLR;ENABLE_LOG XboxOne: TextMeshPro - iPhone: ENABLE_LOG;TextMeshPro;ENABLE_HYBRIDCLR + iPhone: TextMeshPro;ENABLE_HYBRIDCLR;ENABLE_LOG tvOS: TextMeshPro additionalCompilerArguments: {} platformArchitecture: {}