Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
ed22b5b9d2
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue