diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua index 8da0db4d1e..46e12db076 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFightManager.lua @@ -314,6 +314,9 @@ function this.SetEnemyBaseData(data) end -- 获取敌方公会基础信息 function GuildFightManager.GetEnemyBaseData() + if not this._GuildFightBaseData then + return + end local _CurStage = this._GuildFightBaseData.type if _CurStage == GUILD_FIGHT_STAGE.EMPTEY or _CurStage == GUILD_FIGHT_STAGE.UN_START or _CurStage == GUILD_FIGHT_STAGE.DEFEND then return diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua index d04f07e0fb..a2ebd4e995 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/MyGuildManager.lua @@ -33,13 +33,13 @@ function MyGuildManager.InitAllData(func) local step = 0 local function _StepFunc() step = step + 1 - if step == 3 then + if step == 2 then if func then func() end end end NetManager.RequestMyGuildInfo(_StepFunc) this.RequestMyGuildMembers(_StepFunc) - GuildFightManager.InitData(_StepFunc) + -- GuildFightManager.InitData(_StepFunc) end -- 设置我的公会信息 diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 25938a5373..731e4530ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -649,36 +649,36 @@ function this.ExecuteLoading() --[[[20] =]]function() NetManager.RequestGetFriendInfo(4, LoadingPanel.OnStep) end, -- 黑名单 --[[[21] =]]function() FriendChatManager.InitData(LoadingPanel.OnStep) end, -- 好友消息 --[[[22] =]]function() MyGuildManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会信息 - --[[[23] =]]function() GuildFightManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会战 - --[[[24] =]]function() NetManager.GetAllGuildSkillData(LoadingPanel.OnStep) end, -- 公会技能 - --[[[25] =]]function() NetManager.InitFightPointLevelInfo(LoadingPanel.OnStep) end, -- 关卡 - --[[[26] =]]function() NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,LoadingPanel.OnStep) end, -- 大闹天宫 - --[[[27] =]]function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助 - --[[[28] =]]function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵 - --[[[29] =]]function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分 - --[[[30] =]]function() NetManager.RankFirstRequest({3,22,20,4,21},{0,0,0,0,20},LoadingPanel.OnStep) end, -- 排行榜数据 - --[[[31] =]]function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end, --轩辕宝镜 - --[[[32] =]]function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end, --青龙秘宝倒计时 - --[[[33] =]]function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end, --检测所有重复穿戴的宝器并卸下 - --[[[34] =]]function() XiaoYaoManager.GetOpenMapData(LoadingPanel.OnStep) end, --逍遥游 - --[[[35] =]]function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end, --皮肤 - --[[[36] =]]function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼 - --[[[37] =]]function() MonsterCampManager.SetMyHelpHeroData(nil,nil,LoadingPanel.OnStep) end,--助战神将 - --[[[38] =]]function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵 - --[[[39] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, -- - --[[[40] =]]function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end,--无尽英雄数据 - --[[[41] =]]function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end,--无尽密保 - --[[[42] =]]function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包 - --[[[43] =]]function() NetManager.HardStageRequest(LoadingPanel.OnStep) end, --山河社稷图 - --[[[44] =]]function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, --vip + --function() GuildFightManager.InitBaseData(LoadingPanel.OnStep) end, -- 公会战 + --[[[23] =]]function() NetManager.GetAllGuildSkillData(LoadingPanel.OnStep) end, -- 公会技能 + --[[[24] =]]function() NetManager.InitFightPointLevelInfo(LoadingPanel.OnStep) end, -- 关卡 + --[[[25] =]]function() NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,LoadingPanel.OnStep) end, -- 大闹天宫 + --[[[26] =]]function() NetManager.GuildHelpGetAllRequest(LoadingPanel.OnStep) end, -- 公会援助 + --[[[27] =]]function() DeathPosManager.InitData(LoadingPanel.OnStep) end, -- 十绝阵 + --[[[28] =]]function() NetManager.TreasureOfHeavenScoreRequest(LoadingPanel.OnStep) end, -- 天宫秘宝积分 + --[[[29] =]]function() NetManager.RankFirstRequest({3,22,20,4,21},{0,0,0,0,20},LoadingPanel.OnStep) end, -- 排行榜数据 + --[[[30] =]]function() NetManager.GetSituationInfoRequest(LoadingPanel.OnStep) end, --轩辕宝镜 + --[[[31] =]]function() NetManager.RefreshTimeSLRequest(LoadingPanel.OnStep) end, --青龙秘宝倒计时 + --[[[32] =]]function() HeroManager.CheckRepeatTreasure(LoadingPanel.OnStep) end, --检测所有重复穿戴的宝器并卸下 + --[[[33] =]]function() XiaoYaoManager.GetOpenMapData(LoadingPanel.OnStep) end, --逍遥游 + --[[[34] =]]function() NetManager.GetHeroSkinData(LoadingPanel.OnStep) end, --皮肤 + --[[[35] =]]function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼 + --[[[36] =]]function() MonsterCampManager.SetMyHelpHeroData(nil,nil,LoadingPanel.OnStep) end,--助战神将 + --[[[37] =]]function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵 + --[[[38] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, -- + --[[[39] =]]function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end,--无尽英雄数据 + --[[[40] =]]function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end,--无尽密保 + --[[[41] =]]function() MyGuildManager.ReuqsetRedPackage(LoadingPanel.OnStep) end, --请求红包 + --[[[42] =]]function() NetManager.HardStageRequest(LoadingPanel.OnStep) end, --山河社稷图 + --[[[43] =]]function() NetManager.VipLevelStateRequset(LoadingPanel.OnStep) end, --vip --function() JumpServerManager.LoginGetWorldArenaInfoRequest(LoadingPanel.OnStep) end,--跨服天梯 - --[[[45] =]]function() NetManager.RequestRedPacketData(LoadingPanel.OnStep) end, --福利红包 - --[[[46] =]]function() NetManager.BeautyBagWishEquipRequest(nil,LoadingPanel.OnStep) end,--心愿魂印 - --[[[47] =]]function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜 - --[[[48] =]]function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服 - --[[[49] =]]function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷 - --[[[50] =]]function() NetManager.CrossYuXuLunDaoGetInfoRequest(2,LoadingPanel.OnStep) end, --玉虚论道红点 - --[[[51] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度 + --[[[44] =]]function() NetManager.RequestRedPacketData(LoadingPanel.OnStep) end, --福利红包 + --[[[45] =]]function() NetManager.BeautyBagWishEquipRequest(nil,LoadingPanel.OnStep) end,--心愿魂印 + --[[[46] =]]function() LingLongBaoJingManager.InitData(LoadingPanel.OnStep) end, --玲珑宝镜 + --[[[47] =]]function() NetManager.IsCrossRequert(LoadingPanel.OnStep) end, --跨服 + --[[[48] =]]function() NetManager.TaiChuSecretvolumeRequest(LoadingPanel.OnStep) end, --太初密卷 + --[[[49] =]]function() NetManager.CrossYuXuLunDaoGetInfoRequest(2,LoadingPanel.OnStep) end, --玉虚论道红点 + --[[[50] =]]function() NetManager.GetLikeableDataRequest(LoadingPanel.OnStep) end, --好感度 function() -- 登录请求最终接口,所有请求放在此接口之前 -- 登录成功确认 NetManager.LoginConfimRequest()