From 0046012bdbf2827e46e94f11f715ee87f77d9e67 Mon Sep 17 00:00:00 2001 From: "SD-20250424WZPW\\Administrator" Date: Thu, 8 May 2025 16:01:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=8F=E9=80=9F=E7=89=B9=E6=95=88=E7=9A=84?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Configs/GameConfig/Datas/GiftConfig.xlsx | Bin 11771 -> 11784 bytes .../bytes/giftconfig_tbgiftconfig.bytes | Bin 957 -> 957 bytes .../HotFix/GameLogic/Actor/ActorHItem.cs | 1 + .../GameLogic/Manager/DataGameModelManager.cs | 44 +++--- .../HotFix/GameProto/GameConfig/Tables.cs | 143 +++--------------- 5 files changed, 43 insertions(+), 145 deletions(-) diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index 90fc7b33112837d7205c5df5eebdb62866812342..56587ea79423627024b7e05fd8b406a12589899c 100644 GIT binary patch delta 2700 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%0D)wi57(}a=*A&yK zm#PhsbrG+T0{<5_D^d5w!Y2HceI8WzQWea?BGXN!3{+3qr>gqkQ}sD2H9ziBQ(f?> zx>V8ogE8u=13p!UTBCII$;2>+Y%$oms#8!c)sAcC--lyDxU4%qb@$^^@X43~&JC#` zz}MCmkmvwl|Fw?9-rw_ylv;zX@1i!P=K>HzpPS7kJe_1MQ6}4((P!+O&G->UQ z*e-g^Pu6*)M*&b>8m>;>1Z7#|+5Qnb|Kco(4+Wfx&>QD9{+IKVdq{?Np*YHe)7mli z=t7WNl8q6tfA)yJUsTS@@7RnB#kkBf0+-RwGpa75lS*gQTt+v~sJo0_p3!g_{XFBy zWeoC+rpp-S8OJVTlxLi{jH^5&V4{va6sGFLLt(N`HANhG!p)fsG_#XT1g>S^m;&Er z0OhIslg|emf4COvi7+aMFlvM_s(~SVCq8WP3HV<@opvwb29_aJHfCq*=FyetL9vJh$ga@WPFp~kRv}7Rr7SD?ByA0T+ zRVDf72HqHWYv7%M_Xa)~_-NphfvuK>FD(r1wGA!Ee@+;R6NcD?p)+AfOc?4ChOmU8 zDPhP7?35PD1f>N5Nuv4_>p|H91Jrp*V zfrr8d8hR)!%jk2;)#sG4hr(7gkrZ(yWK3e5sZOISW2QQpW9V8%O!a(M5$i;*QEAN$ zyfN_Bf51Bf?+tt~@X^3016wT%qqg*fTPPyJs20K~3&QZ9FpMS)M+w6^!tjVN%peTa zft_uGE$|!LMzWo4!@kZhHAN5F=7Ek5Shlin{H~_xBt0JJ^T2=yhCDFhfh!&u^T0#~ zP=b0QQ%;#FidAqbVilZDve*eN(%rvJtzfMjFCnj?T+`(5TKRd(&y_E6ZhU&ljX*M40Og?(rA zJQQ|f^*t1J!VWwXeolKRY$J|56t>N-JQSwxI8UiDbtjU7+gtLe#?+naEV?jex{nTA zbH;ZWf3UA@%=VcZcw^wLfp-Sp8~9-0qk&HbwptcOVd>emP(g%IDuhuJgke5mxJ(#! z5*}I@22mVN5QgNy&Yr=2>R#SSR!@T?eJ6P-(EA0`x(%{1g4eL@QYo=cJsD?(I1=OH z?$vyQjB}BR%IMyZO>?}NikQRU+KxEOZT|a3f1I=aX10E|#5Q_k(kLIJ0^6n?4~1>h zuFTD4Qc<=8hRA0I<08tzY!N9U?5kB+wu#fsW-z5jT`w~gv4piFj?$C**pC2W4OLD#*NIqO`^HZ!8<%Dn>YVUUU@4{&J|ZW1|a>5F>XI z^{Bx;7yBY94aprIs9rTz5<|BatNM{>yta0Wu%{aGp4qp74K}R-rE{|l#Z-*b ztl&qYm3wAg?wV%h*@@md)f3M~qh!i6VhiAIG@=^MRLJ(s4!NF*M+!dA>Y1o)xVCt) z#x~j!lfC2NG;*HF^d8S-L*6qCOzI!8Q*MAEWeK?I48>GTFLok~)I{Npf7b2_A&tfR zc4evZEFc>iKGPg}b~e|r z*^fldi@P{UlW>)aS;=I*EQ^>V{i@~S|BxQD*9|@#0!Ap4ZzvU$EGjAluO$Eglkh7R zlW-~;0n?LVTklOZfe0os#kEI|QaldCK`0j!heEH(kt ilN~KU0cVq5EnW$t0_Gsq2mk;Ylf^AP2Hq(E0000RO(Pco diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes index 222a479e8d40fcc0d3a12aba02fb53d25025ef30..ca969529591e021efd9aaa363300049d5a8917bc 100644 GIT binary patch delta 33 kcmdnXzL$N1H&cWCMBgS5d9eUUPIhK21yY-LF)}j&0M14WSpWb4 delta 33 kcmdnXzL$N1HxmQHMBgS5d9eUUPIhK21yY-LF)}j&0G&k$T>t<8 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index 3ef1b48f..cfa66413 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -218,6 +218,7 @@ namespace GameLogic eGo.transform.localPosition = Vector3.zero; eGo.transform.localScale = Vector3.one; eGo.transform.GetComponent().scale = giftConfig.EffectScale; + Log.Debug(giftConfig.EffectScale); buff.m_EffectGo = eGo; Log.Debug("生成Buff特效:" + giftConfig.EffectName); diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs index 3fc01e4a..71e11b6c 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameModelManager.cs @@ -282,29 +282,29 @@ public class DataGameModelManager : GameBase.Singleton public async void GetScoreData() { - // 不取这个应该就行了 - Log.Debug("获取积分池数据"); + //// 不取这个应该就行了 + //Log.Debug("获取积分池数据"); - if (EventConts.RoomData != null) - { - // 取积分应该从网络中的接口取 - Dictionary dic = new Dictionary(); - dic.Add("anchorUid", EventConts.RoomData.anchor_open_id); - var request = dic.ToJson(); - var data = await HttpSendHelper.HttpPostRequestAsync(EventConts.PlatformType == PlatformType.None ? EventConts.GetAnchorScoreTest : EventConts.GetAnchorScore, request); - if (string.IsNullOrEmpty(data) == false) - { - var scoreData = JsonHelper.Deserialize(data); - if (scoreData.data != null && scoreData.data.score != null) - { - DataGameSceneManager.Instance.ScoreAllValue = long.Parse(scoreData.data.score); - } - } - } - else - { - Log.Error("没有房间数据.积分池默认不获取"); - } + //if (EventConts.RoomData != null) + //{ + // // 取积分应该从网络中的接口取 + // Dictionary dic = new Dictionary(); + // dic.Add("anchorUid", EventConts.RoomData.anchor_open_id); + // var request = dic.ToJson(); + // var data = await HttpSendHelper.HttpPostRequestAsync(EventConts.PlatformType == PlatformType.None ? EventConts.GetAnchorScoreTest : EventConts.GetAnchorScore, request); + // if (string.IsNullOrEmpty(data) == false) + // { + // var scoreData = JsonHelper.Deserialize(data); + // if (scoreData.data != null && scoreData.data.score != null) + // { + // DataGameSceneManager.Instance.ScoreAllValue = long.Parse(scoreData.data.score); + // } + // } + //} + //else + //{ + // Log.Error("没有房间数据.积分池默认不获取"); + //} } #endregion diff --git a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/Tables.cs b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/Tables.cs index 9f162069..4559159a 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/Tables.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameProto/GameConfig/Tables.cs @@ -13,136 +13,33 @@ namespace GameConfig { public partial class Tables { - #region The Tables - - private item.TbItem m_TbItem; - public item.TbItem TbItem - { - get - { - if (m_TbItem == null) - { - m_TbItem = new item.TbItem(defaultLoader("item_tbitem")); - m_TbItem.ResolveRef(this); - } - return m_TbItem; - } - set - { - m_TbItem = value; - m_TbItem.ResolveRef(this); - } - } - private actorConfig.TbActorConfig m_TbActorConfig; - public actorConfig.TbActorConfig TbActorConfig - { - get - { - if (m_TbActorConfig == null) - { - m_TbActorConfig = new actorConfig.TbActorConfig(defaultLoader("actorconfig_tbactorconfig")); - m_TbActorConfig.ResolveRef(this); - } - return m_TbActorConfig; - } - set - { - m_TbActorConfig = value; - m_TbActorConfig.ResolveRef(this); - } - } - private giftConfig.TbGiftConfig m_TbGiftConfig; - public giftConfig.TbGiftConfig TbGiftConfig - { - get - { - if (m_TbGiftConfig == null) - { - m_TbGiftConfig = new giftConfig.TbGiftConfig(defaultLoader("giftconfig_tbgiftconfig")); - m_TbGiftConfig.ResolveRef(this); - } - return m_TbGiftConfig; - } - set - { - m_TbGiftConfig = value; - m_TbGiftConfig.ResolveRef(this); - } - } - private teamConfig.TbTeamConfig m_TbTeamConfig; - public teamConfig.TbTeamConfig TbTeamConfig - { - get - { - if (m_TbTeamConfig == null) - { - m_TbTeamConfig = new teamConfig.TbTeamConfig(defaultLoader("teamconfig_tbteamconfig")); - m_TbTeamConfig.ResolveRef(this); - } - return m_TbTeamConfig; - } - set - { - m_TbTeamConfig = value; - m_TbTeamConfig.ResolveRef(this); - } - } - private systemConfig.TbSystemConfig m_TbSystemConfig; - public systemConfig.TbSystemConfig TbSystemConfig - { - get - { - if (m_TbSystemConfig == null) - { - m_TbSystemConfig = new systemConfig.TbSystemConfig(defaultLoader("systemconfig_tbsystemconfig")); - m_TbSystemConfig.ResolveRef(this); - } - return m_TbSystemConfig; - } - set - { - m_TbSystemConfig = value; - m_TbSystemConfig.ResolveRef(this); - } - } - private playerLevelConfig.TbPlayerLevelConfig m_TbPlayerLevelConfig; - public playerLevelConfig.TbPlayerLevelConfig TbPlayerLevelConfig - { - get - { - if (m_TbPlayerLevelConfig == null) - { - m_TbPlayerLevelConfig = new playerLevelConfig.TbPlayerLevelConfig(defaultLoader("playerlevelconfig_tbplayerlevelconfig")); - m_TbPlayerLevelConfig.ResolveRef(this); - } - return m_TbPlayerLevelConfig; - } - set - { - m_TbPlayerLevelConfig = value; - m_TbPlayerLevelConfig.ResolveRef(this); - } - } - - #endregion - - System.Func defaultLoader; + public item.TbItem TbItem {get; } + public actorConfig.TbActorConfig TbActorConfig {get; } + public giftConfig.TbGiftConfig TbGiftConfig {get; } + public teamConfig.TbTeamConfig TbTeamConfig {get; } + public systemConfig.TbSystemConfig TbSystemConfig {get; } + public playerLevelConfig.TbPlayerLevelConfig TbPlayerLevelConfig {get; } public Tables(System.Func loader) { - SetDefaultLoader(loader); - Init(); + TbItem = new item.TbItem(loader("item_tbitem")); + TbActorConfig = new actorConfig.TbActorConfig(loader("actorconfig_tbactorconfig")); + TbGiftConfig = new giftConfig.TbGiftConfig(loader("giftconfig_tbgiftconfig")); + TbTeamConfig = new teamConfig.TbTeamConfig(loader("teamconfig_tbteamconfig")); + TbSystemConfig = new systemConfig.TbSystemConfig(loader("systemconfig_tbsystemconfig")); + TbPlayerLevelConfig = new playerLevelConfig.TbPlayerLevelConfig(loader("playerlevelconfig_tbplayerlevelconfig")); + ResolveRef(); } - public void SetDefaultLoader(System.Func loader) + private void ResolveRef() { - defaultLoader = null; - defaultLoader = loader; + TbItem.ResolveRef(this); + TbActorConfig.ResolveRef(this); + TbGiftConfig.ResolveRef(this); + TbTeamConfig.ResolveRef(this); + TbSystemConfig.ResolveRef(this); + TbPlayerLevelConfig.ResolveRef(this); } - - //public partial void Init(); - - public void Init(){} } }