diff --git a/Configs/GameConfig/Datas/GiftConfig.xlsx b/Configs/GameConfig/Datas/GiftConfig.xlsx index 90fc7b33..56587ea7 100644 Binary files a/Configs/GameConfig/Datas/GiftConfig.xlsx and b/Configs/GameConfig/Datas/GiftConfig.xlsx differ diff --git a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes index 222a479e..ca969529 100644 Binary files a/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes and b/UnityProject/Assets/AssetRaw/Configs/bytes/giftconfig_tbgiftconfig.bytes differ 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(){} } }