公会副本提交

dev_chengFeng
zhangqiang 2020-08-26 15:10:33 +08:00
parent d17427269a
commit d51276f132
5 changed files with 424 additions and 307 deletions

View File

@ -332,6 +332,9 @@ GETGUILDCHALLENGEINFORESPONSE_BLOOD_FIELD = protobuf.FieldDescriptor();
GETGUILDCHALLENGEINFORESPONSE_CANSWEEP_FIELD = protobuf.FieldDescriptor();
GETGUILDCHALLENGEINFORESPONSE_BUFFCOUNT_FIELD = protobuf.FieldDescriptor();
GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_FIELD = protobuf.FieldDescriptor();
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD = protobuf.FieldDescriptor();
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD = protobuf.FieldDescriptor();
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD = protobuf.FieldDescriptor();
GUILDCHALLENGEREQUEST = protobuf.Descriptor();
GUILDCHALLENGEREQUEST_BOSSID_FIELD = protobuf.FieldDescriptor();
GUILDCHALLENGEREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
@ -3368,11 +3371,41 @@ GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_FIELD.default_value = 0
GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_FIELD.type = 5
GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_FIELD.cpp_type = 1
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.name = "sweepDamage"
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.full_name = ".com.ljsd.jieling.protocols.GetGuildChallengeInfoResponse.sweepDamage"
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.number = 6
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.index = 5
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.label = 1
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.has_default_value = false
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.default_value = 0
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.type = 5
GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD.cpp_type = 1
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.name = "refreshedBoss"
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.full_name = ".com.ljsd.jieling.protocols.GetGuildChallengeInfoResponse.refreshedBoss"
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.number = 7
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.index = 6
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.label = 3
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.has_default_value = false
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.default_value = {}
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.type = 5
GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD.cpp_type = 1
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.name = "isRefresh"
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.full_name = ".com.ljsd.jieling.protocols.GetGuildChallengeInfoResponse.isRefresh"
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.number = 8
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.index = 7
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.label = 1
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.has_default_value = false
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.default_value = 0
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.type = 5
GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD.cpp_type = 1
GETGUILDCHALLENGEINFORESPONSE.name = "GetGuildChallengeInfoResponse"
GETGUILDCHALLENGEINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetGuildChallengeInfoResponse"
GETGUILDCHALLENGEINFORESPONSE.nested_types = {}
GETGUILDCHALLENGEINFORESPONSE.enum_types = {}
GETGUILDCHALLENGEINFORESPONSE.fields = {GETGUILDCHALLENGEINFORESPONSE_CURBOSS_FIELD, GETGUILDCHALLENGEINFORESPONSE_BLOOD_FIELD, GETGUILDCHALLENGEINFORESPONSE_CANSWEEP_FIELD, GETGUILDCHALLENGEINFORESPONSE_BUFFCOUNT_FIELD, GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_FIELD}
GETGUILDCHALLENGEINFORESPONSE.fields = {GETGUILDCHALLENGEINFORESPONSE_CURBOSS_FIELD, GETGUILDCHALLENGEINFORESPONSE_BLOOD_FIELD, GETGUILDCHALLENGEINFORESPONSE_CANSWEEP_FIELD, GETGUILDCHALLENGEINFORESPONSE_BUFFCOUNT_FIELD, GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_FIELD, GETGUILDCHALLENGEINFORESPONSE_SWEEPDAMAGE_FIELD, GETGUILDCHALLENGEINFORESPONSE_REFRESHEDBOSS_FIELD, GETGUILDCHALLENGEINFORESPONSE_ISREFRESH_FIELD}
GETGUILDCHALLENGEINFORESPONSE.is_extendable = false
GETGUILDCHALLENGEINFORESPONSE.extensions = {}
GUILDCHALLENGEREQUEST_BOSSID_FIELD.name = "bossId"

File diff suppressed because one or more lines are too long

View File

@ -447,6 +447,11 @@ JEWELBUILDREQUEST = protobuf.Descriptor();
JEWELBUILDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
JEWELBUILDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
JEWELBUILDREQUEST_ITEM_FIELD = protobuf.FieldDescriptor();
JADEDYNASTYREFRESHINDICATION = protobuf.Descriptor();
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD = protobuf.FieldDescriptor();
JADEDYNASTYREFRESHTIMERESPONSE = protobuf.Descriptor();
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD = protobuf.FieldDescriptor();
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD = protobuf.FieldDescriptor();
ERRORMSGRESPONSE_MSG_FIELD.name = "msg"
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorMsgResponse.msg"
@ -4526,6 +4531,51 @@ JEWELBUILDREQUEST.enum_types = {}
JEWELBUILDREQUEST.fields = {JEWELBUILDREQUEST_ID_FIELD, JEWELBUILDREQUEST_TYPE_FIELD, JEWELBUILDREQUEST_ITEM_FIELD}
JEWELBUILDREQUEST.is_extendable = false
JEWELBUILDREQUEST.extensions = {}
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.name = "tasks"
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.full_name = ".com.ljsd.jieling.protocols.JadeDynastyRefreshIndication.tasks"
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.number = 1
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.index = 0
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.label = 3
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.has_default_value = false
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.default_value = {}
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.message_type = CommonProto_pb.REFRESHTASK
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.type = 11
JADEDYNASTYREFRESHINDICATION_TASKS_FIELD.cpp_type = 10
JADEDYNASTYREFRESHINDICATION.name = "JadeDynastyRefreshIndication"
JADEDYNASTYREFRESHINDICATION.full_name = ".com.ljsd.jieling.protocols.JadeDynastyRefreshIndication"
JADEDYNASTYREFRESHINDICATION.nested_types = {}
JADEDYNASTYREFRESHINDICATION.enum_types = {}
JADEDYNASTYREFRESHINDICATION.fields = {JADEDYNASTYREFRESHINDICATION_TASKS_FIELD}
JADEDYNASTYREFRESHINDICATION.is_extendable = false
JADEDYNASTYREFRESHINDICATION.extensions = {}
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.name = "dayTime"
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.JadeDynastyRefreshTimeResponse.dayTime"
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.number = 1
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.index = 0
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.label = 1
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.has_default_value = false
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.default_value = 0
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.type = 5
JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD.cpp_type = 1
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.name = "weekTime"
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.full_name = ".com.ljsd.jieling.protocols.JadeDynastyRefreshTimeResponse.weekTime"
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.number = 2
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.index = 1
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.label = 1
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.has_default_value = false
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.default_value = 0
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.type = 5
JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD.cpp_type = 1
JADEDYNASTYREFRESHTIMERESPONSE.name = "JadeDynastyRefreshTimeResponse"
JADEDYNASTYREFRESHTIMERESPONSE.full_name = ".com.ljsd.jieling.protocols.JadeDynastyRefreshTimeResponse"
JADEDYNASTYREFRESHTIMERESPONSE.nested_types = {}
JADEDYNASTYREFRESHTIMERESPONSE.enum_types = {}
JADEDYNASTYREFRESHTIMERESPONSE.fields = {JADEDYNASTYREFRESHTIMERESPONSE_DAYTIME_FIELD, JADEDYNASTYREFRESHTIMERESPONSE_WEEKTIME_FIELD}
JADEDYNASTYREFRESHTIMERESPONSE.is_extendable = false
JADEDYNASTYREFRESHTIMERESPONSE.extensions = {}
ActiviteWorkShopReqeust = protobuf.Message(ACTIVITEWORKSHOPREQEUST)
ActivityUpateIndication = protobuf.Message(ACTIVITYUPATEINDICATION)
@ -4582,6 +4632,8 @@ GetSomeActivityInfoRequest = protobuf.Message(GETSOMEACTIVITYINFOREQUEST)
GetStoreInfosResponse = protobuf.Message(GETSTOREINFOSRESPONSE)
GetWorkShopInfoResponse = protobuf.Message(GETWORKSHOPINFORESPONSE)
InviteFriendRequest = protobuf.Message(INVITEFRIENDREQUEST)
JadeDynastyRefreshIndication = protobuf.Message(JADEDYNASTYREFRESHINDICATION)
JadeDynastyRefreshTimeResponse = protobuf.Message(JADEDYNASTYREFRESHTIMERESPONSE)
JewelBuildRequest = protobuf.Message(JEWELBUILDREQUEST)
LockEquip = protobuf.Message(LOCKEQUIP)
LoginRequest = protobuf.Message(LOGINREQUEST)

View File

@ -13,6 +13,7 @@ local buffTime = 0--buff结束时间
this.damage = 0
this.drop = nil--当场战斗掉落
this.shopGoodId = 10031--公会副本挑战价格
local refreshedBoss = {}
function this.Initialize()
for _, configInfo in ConfigPairs(guildCheckpointConfig) do
table.insert(allChapterConfigData,configInfo)
@ -29,7 +30,17 @@ function this.GetGuildChallengeInfoRequest(fun)
canSweep = msg.canSweep--是否能扫荡今天是否挑战过这个boss
buffCount = msg.buffCount
buffTime = msg.buffTime
-- LogPink("curBoss "..curBoss.." blood "..blood.." canSweep "..canSweep.." buffCount "..buffCount.." buffTime "..buffTime)
this.damage = msg.sweepDamage--上次挑战或扫荡的伤害
for i = 1, #msg.refreshedBoss do
refreshedBoss[msg.refreshedBoss[i]] = msg.refreshedBoss[i]
end
if msg.isRefresh == 1 then
LogPink("msg.isRefresh "..msg.isRefresh)
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
end
-- LogPink("curBoss "..curBoss.." blood "..blood.." canSweep "..canSweep.." buffCount "..buffCount.." buffTime "..buffTime.." sweepDamage "..sweepDamage)
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscriptBuff)
end)
@ -62,7 +73,7 @@ end
local oldBossId = 0
function this.RefreshGuildTranscriptInfo(msg)
oldBossId = curBoss
-- LogGreen("msg.curBoss "..msg.curBoss.." msg.blood "..msg.blood.." msg.isKill "..msg.isKill)
LogGreen("msg.curBoss "..msg.curBoss.." msg.blood "..msg.blood.." msg.isKill "..msg.isKill)
curBoss = msg.curBoss--当前bossId
blood = msg.blood--剩余血量万分比
isKill = msg.isKill--是否击杀
@ -77,12 +88,14 @@ function this.RefreshGuildTranscriptInfo(msg)
if oldBossId ~= curBoss then--前后ID不等认为是击杀
canSweep = 0
isKill = 1
-- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, - PrivilegeManager.GetPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM))
-- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, - PrivilegeManager.GetPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM))
if not refreshedBoss[oldBossId] then
refreshedBoss[oldBossId] = oldBossId
LogPink("msg.refreshedBoss "..oldBossId)
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
end
end
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
end
function this.IsKillShowTip()
@ -148,4 +161,7 @@ end
function this.GetCurBattleIsSkillBoss()
return isKill == 1
end
function this.GetRefreshedBoss()
return refreshedBoss
end
return this

View File

@ -4442,9 +4442,10 @@ function this.GuildChallengeRequest(bossId,type,func)--0为挑战 1为扫荡
local data = buffer:DataByte()
local msg = Family_pb.GuildChallengeResponse()
msg:ParseFromString(data)
if not GuildTranscriptManager.GetCurBattleIsSkillBoss() then--因为此时的indcaton RESPONSE 回来的还早 所以加特殊判断操作
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
-- end
if func then
func(msg)
end