【公会副本】bug修改
parent
145eb02c06
commit
a56d71c4f8
|
@ -353,6 +353,7 @@ GUILDCHALLENGEINDICATION = protobuf.Descriptor();
|
||||||
GUILDCHALLENGEINDICATION_CURBOSS_FIELD = protobuf.FieldDescriptor();
|
GUILDCHALLENGEINDICATION_CURBOSS_FIELD = protobuf.FieldDescriptor();
|
||||||
GUILDCHALLENGEINDICATION_BLOOD_FIELD = protobuf.FieldDescriptor();
|
GUILDCHALLENGEINDICATION_BLOOD_FIELD = protobuf.FieldDescriptor();
|
||||||
GUILDCHALLENGEINDICATION_ISKILL_FIELD = protobuf.FieldDescriptor();
|
GUILDCHALLENGEINDICATION_ISKILL_FIELD = protobuf.FieldDescriptor();
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD = protobuf.FieldDescriptor();
|
||||||
GUILDCHALLENGEBUYBUFFINDICATION = protobuf.Descriptor();
|
GUILDCHALLENGEBUYBUFFINDICATION = protobuf.Descriptor();
|
||||||
GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD = protobuf.FieldDescriptor();
|
GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD = protobuf.FieldDescriptor();
|
||||||
GUILDCHALLENGEBUYBUFFINDICATION_BUFFTIME_FIELD = protobuf.FieldDescriptor();
|
GUILDCHALLENGEBUYBUFFINDICATION_BUFFTIME_FIELD = protobuf.FieldDescriptor();
|
||||||
|
@ -3577,11 +3578,21 @@ GUILDCHALLENGEINDICATION_ISKILL_FIELD.default_value = 0
|
||||||
GUILDCHALLENGEINDICATION_ISKILL_FIELD.type = 5
|
GUILDCHALLENGEINDICATION_ISKILL_FIELD.type = 5
|
||||||
GUILDCHALLENGEINDICATION_ISKILL_FIELD.cpp_type = 1
|
GUILDCHALLENGEINDICATION_ISKILL_FIELD.cpp_type = 1
|
||||||
|
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.name = "isRefresh"
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.full_name = ".rpc.protocols.GuildChallengeIndication.isRefresh"
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.number = 4
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.index = 3
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.label = 1
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.has_default_value = false
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.default_value = 0
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.type = 5
|
||||||
|
GUILDCHALLENGEINDICATION_ISREFRESH_FIELD.cpp_type = 1
|
||||||
|
|
||||||
GUILDCHALLENGEINDICATION.name = "GuildChallengeIndication"
|
GUILDCHALLENGEINDICATION.name = "GuildChallengeIndication"
|
||||||
GUILDCHALLENGEINDICATION.full_name = ".rpc.protocols.GuildChallengeIndication"
|
GUILDCHALLENGEINDICATION.full_name = ".rpc.protocols.GuildChallengeIndication"
|
||||||
GUILDCHALLENGEINDICATION.nested_types = {}
|
GUILDCHALLENGEINDICATION.nested_types = {}
|
||||||
GUILDCHALLENGEINDICATION.enum_types = {}
|
GUILDCHALLENGEINDICATION.enum_types = {}
|
||||||
GUILDCHALLENGEINDICATION.fields = {GUILDCHALLENGEINDICATION_CURBOSS_FIELD, GUILDCHALLENGEINDICATION_BLOOD_FIELD, GUILDCHALLENGEINDICATION_ISKILL_FIELD}
|
GUILDCHALLENGEINDICATION.fields = {GUILDCHALLENGEINDICATION_CURBOSS_FIELD, GUILDCHALLENGEINDICATION_BLOOD_FIELD, GUILDCHALLENGEINDICATION_ISKILL_FIELD, GUILDCHALLENGEINDICATION_ISREFRESH_FIELD}
|
||||||
GUILDCHALLENGEINDICATION.is_extendable = false
|
GUILDCHALLENGEINDICATION.is_extendable = false
|
||||||
GUILDCHALLENGEINDICATION.extensions = {}
|
GUILDCHALLENGEINDICATION.extensions = {}
|
||||||
GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD.name = "buffCount"
|
GUILDCHALLENGEBUYBUFFINDICATION_BUFFCOUNT_FIELD.name = "buffCount"
|
||||||
|
|
|
@ -5,7 +5,6 @@ local allChapterConfigData = {}
|
||||||
local curBoss = 1--当前bossId
|
local curBoss = 1--当前bossId
|
||||||
local blood = 0--剩余血量万分比
|
local blood = 0--剩余血量万分比
|
||||||
local canSweep = 0--是否能扫荡,今天是否挑战过这个boss
|
local canSweep = 0--是否能扫荡,今天是否挑战过这个boss
|
||||||
local isKill = 0 --当场战斗boss 是否击杀
|
|
||||||
local isKillShowTip = false --当场战斗boss 是否击杀
|
local isKillShowTip = false --当场战斗boss 是否击杀
|
||||||
local buffCount = 0--当前buff到多少索引
|
local buffCount = 0--当前buff到多少索引
|
||||||
local buffTime = 0--buff结束时间
|
local buffTime = 0--buff结束时间
|
||||||
|
@ -13,7 +12,7 @@ local buffTime = 0--buff结束时间
|
||||||
this.damage = 0
|
this.damage = 0
|
||||||
this.drop = nil--当场战斗掉落
|
this.drop = nil--当场战斗掉落
|
||||||
this.shopGoodId = 10031--公会副本挑战价格
|
this.shopGoodId = 10031--公会副本挑战价格
|
||||||
local refreshedBoss = {}
|
-- local refreshedBoss = {}
|
||||||
|
|
||||||
local endBossId = 0
|
local endBossId = 0
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
|
@ -36,9 +35,9 @@ function this.GetGuildChallengeInfoRequest(fun)
|
||||||
buffCount = msg.buffCount
|
buffCount = msg.buffCount
|
||||||
buffTime = msg.buffTime
|
buffTime = msg.buffTime
|
||||||
this.damage = msg.sweepDamage--上次挑战或扫荡的伤害
|
this.damage = msg.sweepDamage--上次挑战或扫荡的伤害
|
||||||
for i = 1, #msg.refreshedBoss do
|
-- for i = 1, #msg.refreshedBoss do
|
||||||
refreshedBoss[msg.refreshedBoss[i]] = msg.refreshedBoss[i]
|
-- refreshedBoss[msg.refreshedBoss[i]] = msg.refreshedBoss[i]
|
||||||
end
|
-- end
|
||||||
if msg.isRefresh == 1 then
|
if msg.isRefresh == 1 then
|
||||||
LogPink("公会副本刷新次数····················msg.isRefresh "..msg.isRefresh)
|
LogPink("公会副本刷新次数····················msg.isRefresh "..msg.isRefresh)
|
||||||
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
||||||
|
@ -80,7 +79,6 @@ function this.RefreshGuildTranscriptInfo(msg)
|
||||||
oldBossId = curBoss
|
oldBossId = curBoss
|
||||||
curBoss = msg.curBoss--当前bossId
|
curBoss = msg.curBoss--当前bossId
|
||||||
blood = msg.blood--剩余血量万分比
|
blood = msg.blood--剩余血量万分比
|
||||||
isKill = msg.isKill--是否击杀
|
|
||||||
isKillShowTip = false
|
isKillShowTip = false
|
||||||
if msg.isKill == 1 then
|
if msg.isKill == 1 then
|
||||||
isKillShowTip = true
|
isKillShowTip = true
|
||||||
|
@ -89,19 +87,15 @@ function this.RefreshGuildTranscriptInfo(msg)
|
||||||
PopupTipPanel.ShowTip( string.format(Language[11088],GetLanguageStrById(monsterData.ReadingName)))
|
PopupTipPanel.ShowTip( string.format(Language[11088],GetLanguageStrById(monsterData.ReadingName)))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
LogPink("公会副本刷新次数····················oldBossId "..oldBossId.." msg.curBoss "..msg.curBoss.." msg.blood "..msg.blood.." msg.isKill "..msg.isKill)
|
-- LogRed("msg.isRefresh "..msg.isRefresh)
|
||||||
if oldBossId ~= curBoss then--前后ID不等认为是击杀
|
if msg.isRefresh == 1 then
|
||||||
canSweep = 0
|
-- LogPink("公会副本刷新次数····················msg.isRefresh "..msg.isRefresh)
|
||||||
isKill = 1
|
|
||||||
if not refreshedBoss[oldBossId] then
|
|
||||||
refreshedBoss[oldBossId] = oldBossId
|
|
||||||
LogPink("公会副本刷新次数····················endBossId "..endBossId.." oldBossId "..oldBossId)
|
|
||||||
if endBossId ~= oldBossId then
|
|
||||||
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
||||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
||||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
|
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
|
||||||
end
|
end
|
||||||
end
|
if oldBossId ~= curBoss then--前后ID不等认为是击杀
|
||||||
|
canSweep = 0
|
||||||
end
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
||||||
end
|
end
|
||||||
|
@ -171,10 +165,4 @@ end
|
||||||
function this.GetbuffCount()
|
function this.GetbuffCount()
|
||||||
return buffCount
|
return buffCount
|
||||||
end
|
end
|
||||||
function this.GetCurBattleIsSkillBoss()
|
|
||||||
return isKill == 1
|
|
||||||
end
|
|
||||||
function this.GetRefreshedBoss()
|
|
||||||
return refreshedBoss
|
|
||||||
end
|
|
||||||
return this
|
return this
|
|
@ -4404,14 +4404,12 @@ function this.GuildChallengeRequest(bossId,type,func)--0为挑战 1为扫荡
|
||||||
data.bossId = bossId
|
data.bossId = bossId
|
||||||
data.type = type
|
data.type = type
|
||||||
local msg = data:SerializeToString()
|
local msg = data:SerializeToString()
|
||||||
-- if not GuildTranscriptManager.GetCurBattleIsSkillBoss() or (GuildTranscriptManager.GetCurBattleIsSkillBoss() and curPassBossId[bossId]) then--因为此时的indcaton RESPONSE 回来的还早 所以加特殊判断操作
|
|
||||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
|
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
|
||||||
-- end
|
|
||||||
Network:SendMessageWithCallBack(MessageTypeProto_pb.GUILD_CHALLENGE_REQUEST, MessageTypeProto_pb.GUILD_CHALLENGE_RESPONSE, msg, function(buffer)
|
Network:SendMessageWithCallBack(MessageTypeProto_pb.GUILD_CHALLENGE_REQUEST, MessageTypeProto_pb.GUILD_CHALLENGE_RESPONSE, msg, function(buffer)
|
||||||
local data = buffer:DataByte()
|
local data = buffer:DataByte()
|
||||||
local msg = Family_pb.GuildChallengeResponse()
|
local msg = Family_pb.GuildChallengeResponse()
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
local curPassBossId = GuildTranscriptManager.GetRefreshedBoss()
|
-- local curPassBossId = GuildTranscriptManager.GetRefreshedBoss()
|
||||||
if func then
|
if func then
|
||||||
func(msg)
|
func(msg)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue