Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
0db40d1c9b
|
@ -876,6 +876,7 @@ JumpType = {
|
||||||
DailyCarbon_SoulPrint=71, --每日魂印副本
|
DailyCarbon_SoulPrint=71, --每日魂印副本
|
||||||
DeathPos=72, --十绝阵
|
DeathPos=72, --十绝阵
|
||||||
GuildCarDelay=73 , --车迟斗法
|
GuildCarDelay=73 , --车迟斗法
|
||||||
|
XuanYuanMirror=74 , --车迟斗法
|
||||||
CompoundHero = 78,--神将合成、置换
|
CompoundHero = 78,--神将合成、置换
|
||||||
|
|
||||||
BuyVigor = 10000, --体力购买
|
BuyVigor = 10000, --体力购买
|
||||||
|
|
|
@ -332,6 +332,9 @@ GETGUILDCHALLENGEINFORESPONSE_BLOOD_FIELD = protobuf.FieldDescriptor();
|
||||||
GETGUILDCHALLENGEINFORESPONSE_CANSWEEP_FIELD = protobuf.FieldDescriptor();
|
GETGUILDCHALLENGEINFORESPONSE_CANSWEEP_FIELD = protobuf.FieldDescriptor();
|
||||||
GETGUILDCHALLENGEINFORESPONSE_BUFFCOUNT_FIELD = protobuf.FieldDescriptor();
|
GETGUILDCHALLENGEINFORESPONSE_BUFFCOUNT_FIELD = protobuf.FieldDescriptor();
|
||||||
GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_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 = protobuf.Descriptor();
|
||||||
GUILDCHALLENGEREQUEST_BOSSID_FIELD = protobuf.FieldDescriptor();
|
GUILDCHALLENGEREQUEST_BOSSID_FIELD = protobuf.FieldDescriptor();
|
||||||
GUILDCHALLENGEREQUEST_TYPE_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.type = 5
|
||||||
GETGUILDCHALLENGEINFORESPONSE_BUFFTIME_FIELD.cpp_type = 1
|
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.name = "GetGuildChallengeInfoResponse"
|
||||||
GETGUILDCHALLENGEINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetGuildChallengeInfoResponse"
|
GETGUILDCHALLENGEINFORESPONSE.full_name = ".com.ljsd.jieling.protocols.GetGuildChallengeInfoResponse"
|
||||||
GETGUILDCHALLENGEINFORESPONSE.nested_types = {}
|
GETGUILDCHALLENGEINFORESPONSE.nested_types = {}
|
||||||
GETGUILDCHALLENGEINFORESPONSE.enum_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.is_extendable = false
|
||||||
GETGUILDCHALLENGEINFORESPONSE.extensions = {}
|
GETGUILDCHALLENGEINFORESPONSE.extensions = {}
|
||||||
GUILDCHALLENGEREQUEST_BOSSID_FIELD.name = "bossId"
|
GUILDCHALLENGEREQUEST_BOSSID_FIELD.name = "bossId"
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -447,6 +447,11 @@ JEWELBUILDREQUEST = protobuf.Descriptor();
|
||||||
JEWELBUILDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
|
JEWELBUILDREQUEST_ID_FIELD = protobuf.FieldDescriptor();
|
||||||
JEWELBUILDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
JEWELBUILDREQUEST_TYPE_FIELD = protobuf.FieldDescriptor();
|
||||||
JEWELBUILDREQUEST_ITEM_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.name = "msg"
|
||||||
ERRORMSGRESPONSE_MSG_FIELD.full_name = ".com.ljsd.jieling.protocols.ErrorMsgResponse.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.fields = {JEWELBUILDREQUEST_ID_FIELD, JEWELBUILDREQUEST_TYPE_FIELD, JEWELBUILDREQUEST_ITEM_FIELD}
|
||||||
JEWELBUILDREQUEST.is_extendable = false
|
JEWELBUILDREQUEST.is_extendable = false
|
||||||
JEWELBUILDREQUEST.extensions = {}
|
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)
|
ActiviteWorkShopReqeust = protobuf.Message(ACTIVITEWORKSHOPREQEUST)
|
||||||
ActivityUpateIndication = protobuf.Message(ACTIVITYUPATEINDICATION)
|
ActivityUpateIndication = protobuf.Message(ACTIVITYUPATEINDICATION)
|
||||||
|
@ -4582,6 +4632,8 @@ GetSomeActivityInfoRequest = protobuf.Message(GETSOMEACTIVITYINFOREQUEST)
|
||||||
GetStoreInfosResponse = protobuf.Message(GETSTOREINFOSRESPONSE)
|
GetStoreInfosResponse = protobuf.Message(GETSTOREINFOSRESPONSE)
|
||||||
GetWorkShopInfoResponse = protobuf.Message(GETWORKSHOPINFORESPONSE)
|
GetWorkShopInfoResponse = protobuf.Message(GETWORKSHOPINFORESPONSE)
|
||||||
InviteFriendRequest = protobuf.Message(INVITEFRIENDREQUEST)
|
InviteFriendRequest = protobuf.Message(INVITEFRIENDREQUEST)
|
||||||
|
JadeDynastyRefreshIndication = protobuf.Message(JADEDYNASTYREFRESHINDICATION)
|
||||||
|
JadeDynastyRefreshTimeResponse = protobuf.Message(JADEDYNASTYREFRESHTIMERESPONSE)
|
||||||
JewelBuildRequest = protobuf.Message(JEWELBUILDREQUEST)
|
JewelBuildRequest = protobuf.Message(JEWELBUILDREQUEST)
|
||||||
LockEquip = protobuf.Message(LOCKEQUIP)
|
LockEquip = protobuf.Message(LOCKEQUIP)
|
||||||
LoginRequest = protobuf.Message(LOGINREQUEST)
|
LoginRequest = protobuf.Message(LOGINREQUEST)
|
||||||
|
|
|
@ -421,11 +421,15 @@ end
|
||||||
-- 获取所有正在编队的英雄id
|
-- 获取所有正在编队的英雄id
|
||||||
function this.AllFormationDeleCurHeroId(heroDid)
|
function this.AllFormationDeleCurHeroId(heroDid)
|
||||||
for i, team in pairs(this.formationList) do
|
for i, team in pairs(this.formationList) do
|
||||||
|
local removeIndex
|
||||||
for j = 1, #team.teamHeroInfos do
|
for j = 1, #team.teamHeroInfos do
|
||||||
if team.teamHeroInfos[j] and team.teamHeroInfos[j].heroId == heroDid then
|
if team.teamHeroInfos[j] and team.teamHeroInfos[j].heroId == heroDid then
|
||||||
team.teamHeroInfos[j] = nil
|
removeIndex = j
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if removeIndex then
|
||||||
|
table.remove( team.teamHeroInfos, removeIndex)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,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 = {}
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
for _, configInfo in ConfigPairs(guildCheckpointConfig) do
|
for _, configInfo in ConfigPairs(guildCheckpointConfig) do
|
||||||
table.insert(allChapterConfigData,configInfo)
|
table.insert(allChapterConfigData,configInfo)
|
||||||
|
@ -29,7 +30,17 @@ function this.GetGuildChallengeInfoRequest(fun)
|
||||||
canSweep = msg.canSweep--是否能扫荡,今天是否挑战过这个boss
|
canSweep = msg.canSweep--是否能扫荡,今天是否挑战过这个boss
|
||||||
buffCount = msg.buffCount
|
buffCount = msg.buffCount
|
||||||
buffTime = msg.buffTime
|
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.RefreshGuildTranscript)
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscriptBuff)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscriptBuff)
|
||||||
end)
|
end)
|
||||||
|
@ -62,7 +73,7 @@ end
|
||||||
local oldBossId = 0
|
local oldBossId = 0
|
||||||
function this.RefreshGuildTranscriptInfo(msg)
|
function this.RefreshGuildTranscriptInfo(msg)
|
||||||
oldBossId = curBoss
|
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
|
curBoss = msg.curBoss--当前bossId
|
||||||
blood = msg.blood--剩余血量万分比
|
blood = msg.blood--剩余血量万分比
|
||||||
isKill = msg.isKill--是否击杀
|
isKill = msg.isKill--是否击杀
|
||||||
|
@ -77,11 +88,13 @@ function this.RefreshGuildTranscriptInfo(msg)
|
||||||
if oldBossId ~= curBoss then--前后ID不等认为是击杀
|
if oldBossId ~= curBoss then--前后ID不等认为是击杀
|
||||||
canSweep = 0
|
canSweep = 0
|
||||||
isKill = 1
|
isKill = 1
|
||||||
-- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, - PrivilegeManager.GetPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM))
|
if not refreshedBoss[oldBossId] then
|
||||||
-- PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM, - PrivilegeManager.GetPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM))
|
refreshedBoss[oldBossId] = oldBossId
|
||||||
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
LogPink("msg.refreshedBoss "..oldBossId)
|
||||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
PrivilegeManager.RemovePrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM,3013)
|
||||||
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
|
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
||||||
|
PrivilegeManager.RefreshStarPrivilege(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BUY_BATTLENUM)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
||||||
end
|
end
|
||||||
|
@ -148,4 +161,7 @@ end
|
||||||
function this.GetCurBattleIsSkillBoss()
|
function this.GetCurBattleIsSkillBoss()
|
||||||
return isKill == 1
|
return isKill == 1
|
||||||
end
|
end
|
||||||
|
function this.GetRefreshedBoss()
|
||||||
|
return refreshedBoss
|
||||||
|
end
|
||||||
return this
|
return this
|
|
@ -650,7 +650,7 @@ function this.GetUpStarHeroListData(heroRankUpGroupId, heroData)
|
||||||
for n, w in pairs(FormationManager.formationList) do
|
for n, w in pairs(FormationManager.formationList) do
|
||||||
if this.heroResolveLicence[n] then
|
if this.heroResolveLicence[n] then
|
||||||
for m = 1, #w.teamHeroInfos do
|
for m = 1, #w.teamHeroInfos do
|
||||||
if v.dynamicId == w.teamHeroInfos[m].heroId then
|
if w.teamHeroInfos[m] and v.dynamicId == w.teamHeroInfos[m].heroId then
|
||||||
local isFormationStr = this.GetHeroFormationStr(n)
|
local isFormationStr = this.GetHeroFormationStr(n)
|
||||||
v.isFormation = isFormationStr
|
v.isFormation = isFormationStr
|
||||||
end
|
end
|
||||||
|
|
|
@ -128,7 +128,7 @@ function this:topBar()
|
||||||
else
|
else
|
||||||
needScore = 0
|
needScore = 0
|
||||||
end
|
end
|
||||||
if rewardData.needScore ~= 0 then
|
if rewardData.needScore and rewardData.needScore ~= 0 then
|
||||||
this.scoreText.text = curScore .."/"..rewardData.needScore - needScore
|
this.scoreText.text = curScore .."/"..rewardData.needScore - needScore
|
||||||
this.progress.fillAmount = curScore/(rewardData.needScore - needScore)
|
this.progress.fillAmount = curScore/(rewardData.needScore - needScore)
|
||||||
else
|
else
|
||||||
|
|
|
@ -46,16 +46,19 @@ function this.InitializeData()
|
||||||
this.rewardData[v.ActivityId][v.Level].Reward = temp
|
this.rewardData[v.ActivityId][v.Level].Reward = temp
|
||||||
end
|
end
|
||||||
for i, v in ConfigPairs(TreasureSunLongTaskConfig) do
|
for i, v in ConfigPairs(TreasureSunLongTaskConfig) do
|
||||||
if not taskData[v.Type] then
|
if not taskData[v.ActivityId] then
|
||||||
taskData[v.Type] = {}
|
taskData[v.ActivityId] = {}
|
||||||
end
|
end
|
||||||
taskData[v.Type][v.Id] = {}
|
if not taskData[v.ActivityId][v.Type] then
|
||||||
taskData[v.Type][v.Id].id = v.Id
|
taskData[v.ActivityId][v.Type] = {}
|
||||||
taskData[v.Type][v.Id].show = v.Show
|
end
|
||||||
taskData[v.Type][v.Id].taskValue = v.TaskValue
|
taskData[v.ActivityId][v.Type][v.Id] = {}
|
||||||
taskData[v.Type][v.Id].integral = v.Integral
|
taskData[v.ActivityId][v.Type][v.Id].id = v.Id
|
||||||
taskData[v.Type][v.Id].jump = v.Jump
|
taskData[v.ActivityId][v.Type][v.Id].show = v.Show
|
||||||
taskData[v.Type][v.Id].ActivityId = v.ActivityId
|
taskData[v.ActivityId][v.Type][v.Id].taskValue = v.TaskValue
|
||||||
|
taskData[v.ActivityId][v.Type][v.Id].integral = v.Integral
|
||||||
|
taskData[v.ActivityId][v.Type][v.Id].jump = v.Jump
|
||||||
|
taskData[v.ActivityId][v.Type][v.Id].ActivityId = v.ActivityId
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -164,10 +167,10 @@ function this.GetQinglongTaskData(_curtype)
|
||||||
local task = {}
|
local task = {}
|
||||||
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
local activityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.TreasureOfSomeBody)
|
||||||
for k,v in ipairs(temp) do
|
for k,v in ipairs(temp) do
|
||||||
if taskData[curtype][v.missionId] and taskData[curtype][v.missionId].ActivityId == activityId then
|
if taskData[activityId][curtype][v.missionId] then
|
||||||
taskData[curtype][v.missionId].progress = v.progress
|
taskData[activityId][curtype][v.missionId].progress = v.progress
|
||||||
taskData[curtype][v.missionId].state = v.state
|
taskData[activityId][curtype][v.missionId].state = v.state
|
||||||
table.insert(task, taskData[curtype][v.missionId])
|
table.insert(task, taskData[activityId][curtype][v.missionId])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- LogBlue("每周任务个数:"..#task)
|
-- LogBlue("每周任务个数:"..#task)
|
||||||
|
|
|
@ -4442,9 +4442,10 @@ function this.GuildChallengeRequest(bossId,type,func)--0为挑战 1为扫荡
|
||||||
local data = buffer:DataByte()
|
local data = buffer:DataByte()
|
||||||
local msg = Family_pb.GuildChallengeResponse()
|
local msg = Family_pb.GuildChallengeResponse()
|
||||||
msg:ParseFromString(data)
|
msg:ParseFromString(data)
|
||||||
if not GuildTranscriptManager.GetCurBattleIsSkillBoss() then--因为此时的indcaton RESPONSE 回来的还早 所以加特殊判断操作
|
local curPassBossId = GuildTranscriptManager.GetRefreshedBoss()
|
||||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
|
-- if not GuildTranscriptManager.GetCurBattleIsSkillBoss() or (GuildTranscriptManager.GetCurBattleIsSkillBoss() and curPassBossId[bossId]) then--因为此时的indcaton RESPONSE 回来的还早 所以加特殊判断操作
|
||||||
end
|
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
|
||||||
|
-- end
|
||||||
if func then
|
if func then
|
||||||
func(msg)
|
func(msg)
|
||||||
end
|
end
|
||||||
|
|
|
@ -262,7 +262,23 @@ local jumpDic = {
|
||||||
--end,
|
--end,
|
||||||
[JumpType.Trial] = function(data)--试炼
|
[JumpType.Trial] = function(data)--试炼
|
||||||
CarbonManager.difficulty = 2
|
CarbonManager.difficulty = 2
|
||||||
UIManager.OpenPanel(UIName.TrialCarbonPanel)
|
local trialDataConfig = ConfigManager.GetConfig(ConfigName.TrialConfig)
|
||||||
|
|
||||||
|
if MapTrialManager.curTowerLevel > 10000 then
|
||||||
|
MapManager.curMapId = MapTrialManager.GetSurprisedLevelMapId()
|
||||||
|
else
|
||||||
|
MapManager.curMapId = trialDataConfig[MapTrialManager.curTowerLevel].MapId
|
||||||
|
end
|
||||||
|
MapManager.curCarbonType =CarBonTypeId.TRIAL
|
||||||
|
NetManager.MapInfoRequest(MapManager.curCarbonType, function(msg)
|
||||||
|
MapManager.isReloadEnter = false
|
||||||
|
MapTrialManager.firstEnter = true
|
||||||
|
MapManager.SetViewSize(20)--设置视野范围(明雷形式)
|
||||||
|
MapManager.curAreaId =FormationTypeDef.FORMATION_DREAMLAND
|
||||||
|
MapManager.trialHeroInfo=msg.infos
|
||||||
|
SwitchPanel.OpenPanel(UIName.MapPanel)
|
||||||
|
end)
|
||||||
|
LogBlue(Language[11163])
|
||||||
end,
|
end,
|
||||||
[JumpType.BuyVigor] = function(data)--体力购买
|
[JumpType.BuyVigor] = function(data)--体力购买
|
||||||
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.Energy })
|
UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = UpViewRechargeType.Energy })
|
||||||
|
@ -359,6 +375,7 @@ local jumpDic = {
|
||||||
UIManager.OpenPanel(UIName.GiveMePowerPanel)
|
UIManager.OpenPanel(UIName.GiveMePowerPanel)
|
||||||
end,
|
end,
|
||||||
[JumpType.EndlessFight] = function()--无尽副本
|
[JumpType.EndlessFight] = function()--无尽副本
|
||||||
|
MapManager.curCarbonType = CarBonTypeId.ENDLESS
|
||||||
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
UIManager.OpenPanel(UIName.EndLessCarbonPanel)
|
||||||
end,
|
end,
|
||||||
[JumpType.SoulPrintAstrology] = function()--无尽副本
|
[JumpType.SoulPrintAstrology] = function()--无尽副本
|
||||||
|
@ -506,6 +523,9 @@ local jumpDic = {
|
||||||
[JumpType.CompoundHero] = function()--神将合成、置换
|
[JumpType.CompoundHero] = function()--神将合成、置换
|
||||||
UIManager.OpenPanel(UIName.CompoundHeroPanel)
|
UIManager.OpenPanel(UIName.CompoundHeroPanel)
|
||||||
end,
|
end,
|
||||||
|
[JumpType.XuanYuanMirror] = function()--轩辕
|
||||||
|
UIManager.OpenPanel(UIName.XuanYuanMirrorPanel)
|
||||||
|
end,
|
||||||
--Compound=66, --锻造炉
|
--Compound=66, --锻造炉
|
||||||
--DailyCarbon_Gold=67, --每日金币副本
|
--DailyCarbon_Gold=67, --每日金币副本
|
||||||
--DailyCarbon_Exp=68, --每日经验副本
|
--DailyCarbon_Exp=68, --每日经验副本
|
||||||
|
|
Loading…
Reference in New Issue