From efaa3e51ccfe4b7aa235e527f742f4b35c5149d1 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Wed, 26 Aug 2020 17:45:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=89=AF=E6=9C=AC=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/FirstRecharge/FirstRechargePanel.lua | 2 ++ Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua index a592949aee..84abcbc3e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/FirstRecharge/FirstRechargePanel.lua @@ -118,12 +118,14 @@ function FirstRechargePanel:OnOpen(context,_fun) self.effect:SetActive(false) self.ani.enabled = false self.closeBtn:GetComponent("Button").enabled = false + self.tabs[1]:SetActive(false) Timer.New(function () self.frame:SetActive(true) self.effect:SetActive(true) self.ani.enabled = true end, 1.5):Start() Timer.New(function () + self.tabs[1]:SetActive(true) self.closeBtn:GetComponent("Button").enabled = true end, 2.5):Start() end diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index cc960b6d86..e6b47a80fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4438,14 +4438,14 @@ function this.GuildChallengeRequest(bossId,type,func)--0为挑战 1为扫荡 data.bossId = bossId data.type = type local msg = data:SerializeToString() + -- if not GuildTranscriptManager.GetCurBattleIsSkillBoss() or (GuildTranscriptManager.GetCurBattleIsSkillBoss() and curPassBossId[bossId]) then--因为此时的indcaton RESPONSE 回来的还早 所以加特殊判断操作 + PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权 + -- end Network:SendMessageWithCallBack(MessageTypeProto_pb.GUILD_CHALLENGE_REQUEST, MessageTypeProto_pb.GUILD_CHALLENGE_RESPONSE, msg, function(buffer) local data = buffer:DataByte() local msg = Family_pb.GuildChallengeResponse() msg:ParseFromString(data) local curPassBossId = GuildTranscriptManager.GetRefreshedBoss() - -- if not GuildTranscriptManager.GetCurBattleIsSkillBoss() or (GuildTranscriptManager.GetCurBattleIsSkillBoss() and curPassBossId[bossId]) then--因为此时的indcaton RESPONSE 回来的还早 所以加特殊判断操作 - PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权 - -- end if func then func(msg) end