公会副本提交 达人排行修改

dev_chengFeng
zhangqiang 2020-08-22 18:03:43 +08:00
parent 9aec7d16e8
commit 8f72af20cc
12 changed files with 4481 additions and 4127 deletions

View File

@ -764,6 +764,7 @@ RedPointType = {
Guild_AidBox = 1049,
Guild_Skill = 1050,
Guild_DeathPos=1051,
Guild_Transcript = 1052,
--东海寻仙
FindFairy_OneView = 2361,--东海寻仙主界面
FindFairy_ThreeView = 2362,--东海寻仙进阶赠礼
@ -1290,6 +1291,7 @@ GUILD_MAP_BUILD_TYPE = {
SKILL = 9,--技能
CARDELAY = 10,--车迟
AID = 11,--援助
TRANSCRIPT = 12,--公会副本
}
-- 公会成员信息界面类型
GUILD_MEM_POPUP_TYPE = {
@ -2041,8 +2043,8 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04", name = Language[1
[4] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12167] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = true},
[5] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12168] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = false},
[6] = { bgImage = "r_zjm_paihangbang_banner01", name = Language[12240] ,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = false},
[7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,rankType = RANK_TYPE.FAST_EXPLORE,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false},
[7] = { bgImage = "r_zjm_paihangbang_banner01", name = "军团副本" ,rankType = RANK_TYPE.GUILDTRANSCRIPT,activiteId = 0,isRankingMainPanelShow = false},
[7] = { bgImage = "r_zjm_paihangbang_banner01", name = "极速排名" ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false},
[8] = { bgImage = "r_zjm_paihangbang_banner01", name = "军团副本" ,rankType = RANK_TYPE.GUILDTRANSCRIPT,activiteId = 0,isRankingMainPanelShow = false},
}
SoulPrintSpriteByQuantity={

View File

@ -42,7 +42,7 @@ function Expert:BindEvent()
Util.AddClick(this.rewardBtn, function()
local activityId = ActivityGiftManager.IsActivityTypeOpen(numExChange[activeIndext])
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2)
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2,activeIndext)
end)
end

View File

@ -7,6 +7,7 @@ local expertSortDataTabs = {}--排行
local expertRewardSortTabs = {}--排行奖励
-- 头像对象管理
local _PlayerHeadList = {}
local activeIndext
--初始化组件(用于子类重写)
function ExpertRewardSortPanel:InitComponent()
@ -58,9 +59,10 @@ function ExpertRewardSortPanel:RemoveListener()
end
--界面打开时调用(用于子类重写)
function ExpertRewardSortPanel:OnOpen(_activeId,_type)
function ExpertRewardSortPanel:OnOpen(_activeId,_type,_activeIndext)
activeId = _activeId
type = _type
activeIndext = _activeIndext
--设置信息方法的列表
this.SetInfoFuncList ={
[FUNCTION_OPEN_TYPE.EXPERT] = this.SetGoldExperSortInfo,
@ -156,9 +158,15 @@ function ExpertRewardSortPanel:ActivitySortRewardShow()
self:ActivityRewardSingleShow(expertRewardSortTabs[i],rewardTabs[i])
end
--
RankingManager.InitData(rankKingList[5].rankType, function()
this.SetGoldExperSortInfo()
end)
if activeIndext == 13 then
RankingManager.InitData(rankKingList[5].rankType, function()
this.SetGoldExperSortInfo()
end,ActivityGiftManager.GetActivityIdByType(rankKingList[5].activiteId))
elseif activeIndext == 10 then
RankingManager.InitData(rankKingList[7].rankType, function()
this.SetGoldExperSortInfo()
end,ActivityGiftManager.GetActivityIdByType(rankKingList[7].activiteId))
end
end
function this.SetGoldExperSortInfo()
local sortNumTabs = {}

View File

@ -69,6 +69,14 @@ local _GuildBuildConfig = {
UIManager.OpenPanel(UIName.GuildAidMainPopup)
end,
},
[GUILD_MAP_BUILD_TYPE.TRANSCRIPT] = { --公会副本
isOpen = true,
rpType = RedPointType.Guild_Transcript,
btnName = "btntranscript",
btnFunc = function()
UIManager.OpenPanel(UIName.GuildTranscriptMainPopup)
end,
}
}
local GuildMainCityPanel = Inherit(BasePanel)
local this = GuildMainCityPanel
@ -101,7 +109,6 @@ function GuildMainCityPanel:InitComponent()
this.btnAttack = Util.GetGameObject(this.rightBox, "attack")
this.btnAttackLog = Util.GetGameObject(this.rightBox, "attackLog")
this.btnResult = Util.GetGameObject(this.rightBox, "result")
this.Transcrip = Util.GetGameObject(this.rightBox, "Transcrip")
this.btnRedPacket=Util.GetGameObject(this.rightBox,"redPacket")
this.btnRedPacketRedPoint=Util.GetGameObject(this.btnRedPacket,"redPoint")
-- 嚣张的头像
@ -206,9 +213,6 @@ function GuildMainCityPanel:BindEvent()
UIManager.OpenPanel(UIName.GuildFightResultPopup)
end)
end)
Util.AddClick(this.Transcrip, function()
UIManager.OpenPanel(UIName.GuildTranscriptMainPopup)
end)
--公会红包
Util.AddClick(this.btnRedPacket,function()
UIManager.OpenPanel(UIName.RedPacketPanel)

View File

@ -41,6 +41,7 @@ function GuildTranscriptMainPopup:InitComponent()
this.bossHerohpPass = Util.GetGameObject(this.boss,"hpPass"):GetComponent("Image")
this.bossHerohpPassText = Util.GetGameObject(this.boss,"hpText"):GetComponent("Text")
--titlechapter
this.SelectImage = Util.GetGameObject(self.gameObject, "upChapterGo/SelectImage")
local v2 = Util.GetGameObject(self.gameObject, "upChapterGo/upChapter"):GetComponent("RectTransform").rect
this.titleScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "upChapterGo/upChapter").transform,
Util.GetGameObject(self.gameObject, "upChapterGo/singleChapterPre"), nil, Vector2.New(-v2.x*2, -v2.y*2), 2, 1, Vector2.New(10,10))
@ -54,7 +55,7 @@ function GuildTranscriptMainPopup:InitComponent()
--rank
local v2New = Util.GetGameObject(self.gameObject, "endGo/rankList"):GetComponent("RectTransform").rect
this.rankScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "endGo/rankList").transform,
Util.GetGameObject(self.gameObject, "endGo/ItemPre"), nil, Vector2.New(906.8, 545.4), 1, 1, Vector2.New(10,10))
Util.GetGameObject(self.gameObject, "endGo/ItemPre"), nil, Vector2.New(906.8, 545.4), 1, 1, Vector2.New(0,0))
this.rankScrollView.moveTween.MomentumAmount = 1
this.rankScrollView.moveTween.Strength = 1
end
@ -214,9 +215,6 @@ function this.ShowPanelData()
cutOpenIndex = GuildTranscriptManager.GetCurBoss()
this.ShowTitleChapterInfo()
this.ShowPanelInfo(cutOpenIndex)
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
this.ShowRankingListInfo()
end,GuildTranscriptManager.GetCurBoss())
end
function GuildTranscriptMainPopup:OnSortingOrderChange()
for i, v in pairs(itemList) do
@ -269,14 +267,15 @@ function this.SingleChapterDataShow(go,data)
lock:SetActive(true)
mask:SetActive(true)
end
if cutOpenIndex == data.Id then
this.SetSelectImagePos(go)
end
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
if data.Id > GuildTranscriptManager.GetCurBoss() then
return PopupTipPanel.ShowTip("击败前一个首领方可解锁!")
end
this.ShowPanelInfo(data.Id)
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
this.ShowRankingListInfo()
end,data.Id)
this.SetSelectImagePos(go)
end)
end
@ -311,6 +310,7 @@ function this.SingleRankingInfoShow(root,rankData)
Util.GetGameObject(root, "name"):GetComponent("Text").text = rankData.userName
Util.GetGameObject(root, "progressbar/progress1"):GetComponent("Image").fillAmount = math.floor((rankData.rankInfo.param1/firstDamage)*100)/100
Util.GetGameObject(root, "progressbar/num"):GetComponent("Text").text = rankData.rankInfo.param1--.."/"..firstDamage
Util.GetGameObject(root, "SelfBG"):SetActive(PlayerManager.uid == rankData.uid)
local clickBtn=Util.GetGameObject(root,"ClickBtn")
Util.AddOnceClick(clickBtn,function()
UIManager.OpenPanel(UIName.PlayerInfoPopup, rankData.uid)
@ -335,6 +335,10 @@ function this.ShowQuickBtnData()
this.warbtn:GetComponent("Button").enabled = isEqualityChapter
Util.SetGray(this.quickWarbtn,not (canSweep and isEqualityChapter))
Util.SetGray(this.warbtn,not isEqualityChapter)
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
this.ShowRankingListInfo()
end,cutOpenIndex)
end
--显示boss立绘信息
function this.ShowBossInfo()
@ -419,6 +423,9 @@ function this.QuickWar()
GuildTranscriptManager.GuildChallengeRequest(1,function()
this.ShowPanelData()
this.ShowEndNumInfo()
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
this.ShowRankingListInfo()
end,GuildTranscriptManager.GetCurBoss())
end)
end
function this.ShowBuffData()
@ -481,6 +488,13 @@ function this.TimeStampToDateString(second)
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
return string.format("(%s:%s:%s:后失效)", hour, minute, sec)
end
function this.SetSelectImagePos(parent)
this.SelectImage.transform:SetParent(Util.GetGameObject(parent, "GameObject").transform)
this.SelectImage:GetComponent("RectTransform").localPosition = Vector3.zero
this.SelectImage:GetComponent("RectTransform").localScale = Vector3.New(1,1,1)
end
--界面关闭时调用(用于子类重写)
function GuildTranscriptMainPopup:OnClose()
end

View File

@ -43,6 +43,7 @@ function this.GuildChallengeRequest(attackType,callBack)
canSweep = 1
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GuildTranscript, callBack)
CheckRedPointStatus(RedPointType.Guild_Transcript)
end)
elseif attackType == 1 then--快速战斗 扫荡
NetManager.GuildChallengeRequest(this.GetCurBoss(),attackType,function (msg)
@ -53,6 +54,7 @@ function this.GuildChallengeRequest(attackType,callBack)
callBack()
end
end, 6,true,true)
CheckRedPointStatus(RedPointType.Guild_Transcript)
end)
end
end

View File

@ -73,14 +73,14 @@ local _GuildBuildConfig = {
rpType = RedPointType.Guild_Skill,
rpPos = Vector3.New(53, 137, 0),
},
-- [GUILD_MAP_BUILD_TYPE.CARDELAY] = { --车迟斗法
-- bgImg = "r_gonghui_qizhi",
-- nameImg = "r_gonghui_chechidoufa",
-- pos = Vector3.New(2626, -761, 0),
-- namePos = Vector3.New(0, 13.4, 0),
-- rpType = RedPointType.Guild_CarDeleay,
-- rpPos = Vector3.New(53, 137, 0),
-- },
[GUILD_MAP_BUILD_TYPE.BOSS] = { --公会副本
bgImg = "r_gonghui_qizhi",
nameImg = "r_gonghui_zhao",
pos = Vector3.New(266, -158, 0),
namePos = Vector3.New(0, 13.4, 0),
rpType = RedPointType.Guild_Transcript,
rpPos = Vector3.New(53, 137, 0),
},
[GUILD_MAP_BUILD_TYPE.AID] = { --援助
bgImg = "r_gonghui_qizhi",
nameImg = "r_gonghui_yuanzhu",

View File

@ -229,6 +229,7 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.Guild_AidMy, RedPointType.Guild_Aid)
RPData:SetParent(RedPointType.Guild_AidGuild, RedPointType.Guild_Aid)
RPData:SetParent(RedPointType.Guild_AidBox, RedPointType.Guild_Aid)
RPData:SetParent(RedPointType.Guild_Transcript, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_Skill, RedPointType.Guild)
RPData:SetParent(RedPointType.Guild_DeathPos, RedPointType.Guild)
@ -277,6 +278,7 @@ function this.RegisterRedCheckFunc()
RPData:AddCheckFunc(RedPointType.Shop_Roam_Check, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Shop_Guild_Check, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Guild_Shop, ShopManager.ShopRedCheck)
RPData:AddCheckFunc(RedPointType.Guild_Transcript, GuildTranscriptManager.GetRedPointState)
RPData:AddCheckFunc(RedPointType.VIP_SHOP_DETAIL, VipManager.CheckRedPoint)
RPData:AddCheckFunc(RedPointType.VipPrivilege, VipManager.CheckNewVipRP)
RPData:AddCheckFunc(RedPointType.GrowthGift, OperatingManager.GetGrowthRedPointState)

View File

@ -12,7 +12,7 @@ end
--初始化排行数据(待优化)
function this.InitData(rankType,fun,id)
local activiteId = id > 0 and id or nil--点金时需要 当为公会副本是为章节id
local activiteId = (id ~= nil and id > 0) and id or nil--点金时需要 当为公会副本是为章节id
NetManager.RequestRankInfo(rankType, function (msg)--请求数据
this.ReceiveRankingData(msg,fun)
end,activiteId)

View File

@ -105,9 +105,10 @@ end
function this.GetRankInfo(rankType)
RankingManager.CurPage=0
this.istop=true
local curActivity = sData.activiteId > 0 and ActivityGiftManager.GetActivityIdByType(sData.activiteId) or nil
RankingManager.InitData(rankType,function()
this.SetRankingInfo()
end,sData.activiteId)
end,curActivity)
end
---设置排名信息
@ -357,6 +358,11 @@ function this.SetInfoShow(go,data,rankType,Value0)
end
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
end
if sData.activiteId == ActivityTypeDef.GoldExper then
goldExper:GetComponent("Text").text = "点金次数"
elseif sData.activiteId == ActivityTypeDef.FastExplore then
goldExper:GetComponent("Text").text = "极速次数"
end
elseif rankType == RANK_TYPE.ARENA_RANK then
-- if data.personInfo.score and data.personInfo.score > 0 then
arenaScore:SetActive(true)