Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
4477c38a25
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -764,6 +764,7 @@ RedPointType = {
|
||||||
Guild_AidBox = 1049,
|
Guild_AidBox = 1049,
|
||||||
Guild_Skill = 1050,
|
Guild_Skill = 1050,
|
||||||
Guild_DeathPos=1051,
|
Guild_DeathPos=1051,
|
||||||
|
Guild_Transcript = 1052,
|
||||||
--东海寻仙
|
--东海寻仙
|
||||||
FindFairy_OneView = 2361,--东海寻仙主界面
|
FindFairy_OneView = 2361,--东海寻仙主界面
|
||||||
FindFairy_ThreeView = 2362,--东海寻仙进阶赠礼
|
FindFairy_ThreeView = 2362,--东海寻仙进阶赠礼
|
||||||
|
|
@ -1290,6 +1291,7 @@ GUILD_MAP_BUILD_TYPE = {
|
||||||
SKILL = 9,--技能
|
SKILL = 9,--技能
|
||||||
CARDELAY = 10,--车迟
|
CARDELAY = 10,--车迟
|
||||||
AID = 11,--援助
|
AID = 11,--援助
|
||||||
|
TRANSCRIPT = 12,--公会副本
|
||||||
}
|
}
|
||||||
-- 公会成员信息界面类型
|
-- 公会成员信息界面类型
|
||||||
GUILD_MEM_POPUP_TYPE = {
|
GUILD_MEM_POPUP_TYPE = {
|
||||||
|
|
@ -1765,6 +1767,7 @@ RANK_TYPE = {
|
||||||
ARENA_RANK=23,-- 竞技场积分排名 前端自己添加
|
ARENA_RANK=23,-- 竞技场积分排名 前端自己添加
|
||||||
XUANYUANMIRROR_RANK=24,-- 竞技场积分排名 前端自己添加
|
XUANYUANMIRROR_RANK=24,-- 竞技场积分排名 前端自己添加
|
||||||
FAST_EXPLORE=25,--极速达人排行
|
FAST_EXPLORE=25,--极速达人排行
|
||||||
|
GUILDTRANSCRIPT=26,--公会排行
|
||||||
}
|
}
|
||||||
|
|
||||||
--东海寻仙弹窗类型
|
--东海寻仙弹窗类型
|
||||||
|
|
@ -2040,7 +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},
|
[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},
|
[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},
|
[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.GOLD_EXPER,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = false},
|
||||||
|
[8] = { bgImage = "r_zjm_paihangbang_banner01", name = "军团副本" ,rankType = RANK_TYPE.GUILDTRANSCRIPT,activiteId = 0,isRankingMainPanelShow = false},
|
||||||
}
|
}
|
||||||
|
|
||||||
SoulPrintSpriteByQuantity={
|
SoulPrintSpriteByQuantity={
|
||||||
|
|
|
||||||
|
|
@ -446,6 +446,7 @@ function this.ShowBattleResult(result, msg)
|
||||||
end
|
end
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscripQuickBtn)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscripQuickBtn)
|
||||||
|
GuildTranscriptManager.IsKillShowTip()
|
||||||
end, 6,true,true)
|
end, 6,true,true)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -42,7 +42,7 @@ function Expert:BindEvent()
|
||||||
|
|
||||||
Util.AddClick(this.rewardBtn, function()
|
Util.AddClick(this.rewardBtn, function()
|
||||||
local activityId = ActivityGiftManager.IsActivityTypeOpen(numExChange[activeIndext])
|
local activityId = ActivityGiftManager.IsActivityTypeOpen(numExChange[activeIndext])
|
||||||
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2)
|
UIManager.OpenPanel(UIName.ExpertRewardSortPanel,activityId,2,activeIndext)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ local expertSortDataTabs = {}--排行
|
||||||
local expertRewardSortTabs = {}--排行奖励
|
local expertRewardSortTabs = {}--排行奖励
|
||||||
-- 头像对象管理
|
-- 头像对象管理
|
||||||
local _PlayerHeadList = {}
|
local _PlayerHeadList = {}
|
||||||
|
local activeIndext
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function ExpertRewardSortPanel:InitComponent()
|
function ExpertRewardSortPanel:InitComponent()
|
||||||
|
|
||||||
|
|
@ -58,9 +59,10 @@ function ExpertRewardSortPanel:RemoveListener()
|
||||||
end
|
end
|
||||||
|
|
||||||
--界面打开时调用(用于子类重写)
|
--界面打开时调用(用于子类重写)
|
||||||
function ExpertRewardSortPanel:OnOpen(_activeId,_type)
|
function ExpertRewardSortPanel:OnOpen(_activeId,_type,_activeIndext)
|
||||||
activeId = _activeId
|
activeId = _activeId
|
||||||
type = _type
|
type = _type
|
||||||
|
activeIndext = _activeIndext
|
||||||
--设置信息方法的列表
|
--设置信息方法的列表
|
||||||
this.SetInfoFuncList ={
|
this.SetInfoFuncList ={
|
||||||
[FUNCTION_OPEN_TYPE.EXPERT] = this.SetGoldExperSortInfo,
|
[FUNCTION_OPEN_TYPE.EXPERT] = this.SetGoldExperSortInfo,
|
||||||
|
|
@ -156,9 +158,15 @@ function ExpertRewardSortPanel:ActivitySortRewardShow()
|
||||||
self:ActivityRewardSingleShow(expertRewardSortTabs[i],rewardTabs[i])
|
self:ActivityRewardSingleShow(expertRewardSortTabs[i],rewardTabs[i])
|
||||||
end
|
end
|
||||||
--
|
--
|
||||||
RankingManager.InitData(rankKingList[5].rankType, function()
|
if activeIndext == 13 then
|
||||||
this.SetGoldExperSortInfo()
|
RankingManager.InitData(rankKingList[5].rankType, function()
|
||||||
end)
|
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
|
end
|
||||||
function this.SetGoldExperSortInfo()
|
function this.SetGoldExperSortInfo()
|
||||||
local sortNumTabs = {}
|
local sortNumTabs = {}
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,14 @@ local _GuildBuildConfig = {
|
||||||
UIManager.OpenPanel(UIName.GuildAidMainPopup)
|
UIManager.OpenPanel(UIName.GuildAidMainPopup)
|
||||||
end,
|
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 GuildMainCityPanel = Inherit(BasePanel)
|
||||||
local this = GuildMainCityPanel
|
local this = GuildMainCityPanel
|
||||||
|
|
@ -101,7 +109,6 @@ function GuildMainCityPanel:InitComponent()
|
||||||
this.btnAttack = Util.GetGameObject(this.rightBox, "attack")
|
this.btnAttack = Util.GetGameObject(this.rightBox, "attack")
|
||||||
this.btnAttackLog = Util.GetGameObject(this.rightBox, "attackLog")
|
this.btnAttackLog = Util.GetGameObject(this.rightBox, "attackLog")
|
||||||
this.btnResult = Util.GetGameObject(this.rightBox, "result")
|
this.btnResult = Util.GetGameObject(this.rightBox, "result")
|
||||||
this.Transcrip = Util.GetGameObject(this.rightBox, "Transcrip")
|
|
||||||
this.btnRedPacket=Util.GetGameObject(this.rightBox,"redPacket")
|
this.btnRedPacket=Util.GetGameObject(this.rightBox,"redPacket")
|
||||||
this.btnRedPacketRedPoint=Util.GetGameObject(this.btnRedPacket,"redPoint")
|
this.btnRedPacketRedPoint=Util.GetGameObject(this.btnRedPacket,"redPoint")
|
||||||
-- 嚣张的头像
|
-- 嚣张的头像
|
||||||
|
|
@ -206,9 +213,6 @@ function GuildMainCityPanel:BindEvent()
|
||||||
UIManager.OpenPanel(UIName.GuildFightResultPopup)
|
UIManager.OpenPanel(UIName.GuildFightResultPopup)
|
||||||
end)
|
end)
|
||||||
end)
|
end)
|
||||||
Util.AddClick(this.Transcrip, function()
|
|
||||||
UIManager.OpenPanel(UIName.GuildTranscriptMainPopup)
|
|
||||||
end)
|
|
||||||
--公会红包
|
--公会红包
|
||||||
Util.AddClick(this.btnRedPacket,function()
|
Util.AddClick(this.btnRedPacket,function()
|
||||||
UIManager.OpenPanel(UIName.RedPacketPanel)
|
UIManager.OpenPanel(UIName.RedPacketPanel)
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ local cutOpenIndexMonsterConFig
|
||||||
local itemList = {}--优化itemView使用
|
local itemList = {}--优化itemView使用
|
||||||
local sorting = 0
|
local sorting = 0
|
||||||
local curBuyIndex = 0
|
local curBuyIndex = 0
|
||||||
|
this.playerScrollHead={}--滚动条头像
|
||||||
--初始化组件(用于子类重写)
|
--初始化组件(用于子类重写)
|
||||||
function GuildTranscriptMainPopup:InitComponent()
|
function GuildTranscriptMainPopup:InitComponent()
|
||||||
--btn
|
--btn
|
||||||
|
|
@ -40,6 +41,7 @@ function GuildTranscriptMainPopup:InitComponent()
|
||||||
this.bossHerohpPass = Util.GetGameObject(this.boss,"hpPass"):GetComponent("Image")
|
this.bossHerohpPass = Util.GetGameObject(this.boss,"hpPass"):GetComponent("Image")
|
||||||
this.bossHerohpPassText = Util.GetGameObject(this.boss,"hpText"):GetComponent("Text")
|
this.bossHerohpPassText = Util.GetGameObject(this.boss,"hpText"):GetComponent("Text")
|
||||||
--titlechapter
|
--titlechapter
|
||||||
|
this.SelectImage = Util.GetGameObject(self.gameObject, "upChapterGo/SelectImage")
|
||||||
local v2 = Util.GetGameObject(self.gameObject, "upChapterGo/upChapter"):GetComponent("RectTransform").rect
|
local v2 = Util.GetGameObject(self.gameObject, "upChapterGo/upChapter"):GetComponent("RectTransform").rect
|
||||||
this.titleScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, Util.GetGameObject(self.gameObject, "upChapterGo/upChapter").transform,
|
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))
|
Util.GetGameObject(self.gameObject, "upChapterGo/singleChapterPre"), nil, Vector2.New(-v2.x*2, -v2.y*2), 2, 1, Vector2.New(10,10))
|
||||||
|
|
@ -49,6 +51,13 @@ function GuildTranscriptMainPopup:InitComponent()
|
||||||
this.reward2 = Util.GetGameObject(self.gameObject, "middleGo/rewardGo/reward2")
|
this.reward2 = Util.GetGameObject(self.gameObject, "middleGo/rewardGo/reward2")
|
||||||
this.Empty = Util.GetGameObject(self.gameObject, "endGo/Empty")
|
this.Empty = Util.GetGameObject(self.gameObject, "endGo/Empty")
|
||||||
Util.GetGameObject(self.gameObject, "endGo/Empty/Bg/Text"):GetComponent("Text").text = "还未有人挑战过此首领"
|
Util.GetGameObject(self.gameObject, "endGo/Empty/Bg/Text"):GetComponent("Text").text = "还未有人挑战过此首领"
|
||||||
|
|
||||||
|
--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(0,0))
|
||||||
|
this.rankScrollView.moveTween.MomentumAmount = 1
|
||||||
|
this.rankScrollView.moveTween.Strength = 1
|
||||||
end
|
end
|
||||||
--绑定事件(用于子类重写)
|
--绑定事件(用于子类重写)
|
||||||
function GuildTranscriptMainPopup:BindEvent()
|
function GuildTranscriptMainPopup:BindEvent()
|
||||||
|
|
@ -223,6 +232,21 @@ function this.ShowTitleChapterInfo()
|
||||||
end)
|
end)
|
||||||
this.titleScrollView:SetIndex(cutOpenIndex)
|
this.titleScrollView:SetIndex(cutOpenIndex)
|
||||||
end
|
end
|
||||||
|
local rankingInfo,myRankingInfo
|
||||||
|
local firstDamage = 0
|
||||||
|
function this.ShowRankingListInfo()
|
||||||
|
rankingInfo,myRankingInfo = RankingManager.GetRankingInfo()
|
||||||
|
LogGreen("#rankingInfo "..#rankingInfo)
|
||||||
|
this.Empty:SetActive(#rankingInfo == 0)
|
||||||
|
Util.GetGameObject(this.gameObject, "endGo/rankList"):SetActive(#rankingInfo ~= 0)
|
||||||
|
if #rankingInfo > 0 then
|
||||||
|
firstDamage = rankingInfo[1].rankInfo.param1
|
||||||
|
end
|
||||||
|
this.rankScrollView :SetData(rankingInfo, function (index, go)
|
||||||
|
this.SingleRankingInfoShow(go, rankingInfo[index])
|
||||||
|
end)
|
||||||
|
this.rankScrollView:SetIndex(1)
|
||||||
|
end
|
||||||
function this.SingleChapterDataShow(go,data)
|
function this.SingleChapterDataShow(go,data)
|
||||||
Util.GetGameObject(go,"title/Text"):GetComponent("Text").text = data.Remarks
|
Util.GetGameObject(go,"title/Text"):GetComponent("Text").text = data.Remarks
|
||||||
local lock = Util.GetGameObject(go,"lock")
|
local lock = Util.GetGameObject(go,"lock")
|
||||||
|
|
@ -243,18 +267,60 @@ function this.SingleChapterDataShow(go,data)
|
||||||
lock:SetActive(true)
|
lock:SetActive(true)
|
||||||
mask:SetActive(true)
|
mask:SetActive(true)
|
||||||
end
|
end
|
||||||
|
if cutOpenIndex == data.Id then
|
||||||
|
this.SetSelectImagePos(go)
|
||||||
|
end
|
||||||
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
|
Util.AddOnceClick(Util.GetGameObject(go,"click"),function()
|
||||||
if data.Id > GuildTranscriptManager.GetCurBoss() then
|
if data.Id > GuildTranscriptManager.GetCurBoss() then
|
||||||
return PopupTipPanel.ShowTip("击败前一个首领方可解锁!")
|
return PopupTipPanel.ShowTip("击败前一个首领方可解锁!")
|
||||||
end
|
end
|
||||||
this.ShowPanelInfo(data.Id)
|
this.ShowPanelInfo(data.Id)
|
||||||
|
this.SetSelectImagePos(go)
|
||||||
|
end)
|
||||||
|
end
|
||||||
|
|
||||||
|
function this.SingleRankingInfoShow(root,rankData)
|
||||||
|
--排名
|
||||||
|
local rank = rankData.rankInfo.rank
|
||||||
|
local sortNumTabs={}
|
||||||
|
for i = 1, 4 do
|
||||||
|
sortNumTabs[i]=Util.GetGameObject(root,"SortNum/SortNum ("..i..")")
|
||||||
|
sortNumTabs[i]:SetActive(false)
|
||||||
|
end
|
||||||
|
if rank < 4 then
|
||||||
|
sortNumTabs[rank]:SetActive(true)
|
||||||
|
else
|
||||||
|
sortNumTabs[4]:SetActive(true)
|
||||||
|
if rank > 100 then
|
||||||
|
rank="100+"
|
||||||
|
end
|
||||||
|
Util.GetGameObject(sortNumTabs[4], "TitleText"):GetComponent("Text").text = rank
|
||||||
|
end
|
||||||
|
--头像
|
||||||
|
local headObj=Util.GetGameObject(root,"Head")
|
||||||
|
if not this.playerScrollHead[root] then
|
||||||
|
this.playerScrollHead[root]=CommonPool.CreateNode(POOL_ITEM_TYPE.PLAYER_HEAD,headObj)
|
||||||
|
end
|
||||||
|
this.playerScrollHead[root]:Reset()
|
||||||
|
this.playerScrollHead[root]:SetHead(rankData.head)
|
||||||
|
this.playerScrollHead[root]:SetFrame(rankData.headFrame)
|
||||||
|
this.playerScrollHead[root]:SetLevel(rankData.level)
|
||||||
|
this.playerScrollHead[root]:SetScale(Vector3.one*0.7)
|
||||||
|
--
|
||||||
|
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)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.ShowPanelInfo(chapterId)
|
function this.ShowPanelInfo(chapterId)
|
||||||
|
cutOpenIndex = chapterId
|
||||||
this.ShowQuickBtnData()
|
this.ShowQuickBtnData()
|
||||||
this.ShowEndNumInfo()
|
this.ShowEndNumInfo()
|
||||||
cutOpenIndex = chapterId
|
|
||||||
cutOpenIndexConFig = guildCheckpointConfig[cutOpenIndex]
|
cutOpenIndexConFig = guildCheckpointConfig[cutOpenIndex]
|
||||||
cutOpenIndexMonsterConFig =this.GetMonsterConfigDataById(guildCheckpointConfig[cutOpenIndex].MonsterId)
|
cutOpenIndexMonsterConFig =this.GetMonsterConfigDataById(guildCheckpointConfig[cutOpenIndex].MonsterId)
|
||||||
this.ShowBossInfo()
|
this.ShowBossInfo()
|
||||||
|
|
@ -269,6 +335,10 @@ function this.ShowQuickBtnData()
|
||||||
this.warbtn:GetComponent("Button").enabled = isEqualityChapter
|
this.warbtn:GetComponent("Button").enabled = isEqualityChapter
|
||||||
Util.SetGray(this.quickWarbtn,not (canSweep and isEqualityChapter))
|
Util.SetGray(this.quickWarbtn,not (canSweep and isEqualityChapter))
|
||||||
Util.SetGray(this.warbtn,not isEqualityChapter)
|
Util.SetGray(this.warbtn,not isEqualityChapter)
|
||||||
|
|
||||||
|
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
|
||||||
|
this.ShowRankingListInfo()
|
||||||
|
end,cutOpenIndex)
|
||||||
end
|
end
|
||||||
--显示boss立绘信息
|
--显示boss立绘信息
|
||||||
function this.ShowBossInfo()
|
function this.ShowBossInfo()
|
||||||
|
|
@ -315,7 +385,6 @@ function this.ShowRewardInfo()
|
||||||
end
|
end
|
||||||
itemList[this.reward1.name][i].gameObject:SetActive(true)
|
itemList[this.reward1.name][i].gameObject:SetActive(true)
|
||||||
end
|
end
|
||||||
LogGreen("#reward2Data "..#reward2Data)
|
|
||||||
for i = 1, #reward2Data do
|
for i = 1, #reward2Data do
|
||||||
if itemList[this.reward2.name][i] then
|
if itemList[this.reward2.name][i] then
|
||||||
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting)
|
itemList[this.reward2.name][i]:OnOpen(false, reward2Data[i], 0.6,false,false,false,sorting)
|
||||||
|
|
@ -347,18 +416,18 @@ function this.GetMonsterConfigDataById(MonsterId)
|
||||||
return monsterData
|
return monsterData
|
||||||
end
|
end
|
||||||
function this.ShowEndNumInfo()
|
function this.ShowEndNumInfo()
|
||||||
this.endNumText.text = "剩余购买次数:" .. GuildTranscriptManager.GetCanBattleCount()
|
this.endNumText.text = "剩余次数:" .. GuildTranscriptManager.GetCanBattleCount()
|
||||||
this.endNumBuyText.text = "剩余次数:" .. GuildTranscriptManager.GetCanBuyBattleCount()
|
this.endNumBuyText.text = "剩余购买次数:" .. GuildTranscriptManager.GetCanBuyBattleCount()
|
||||||
end
|
end
|
||||||
function this.QuickWar()
|
function this.QuickWar()
|
||||||
GuildTranscriptManager.GuildChallengeRequest(1,function()
|
GuildTranscriptManager.GuildChallengeRequest(1,function()
|
||||||
this.ShowPanelData()
|
this.ShowPanelData()
|
||||||
this.ShowEndNumInfo()
|
this.ShowEndNumInfo()
|
||||||
|
RankingManager.InitData(RANK_TYPE.GUILDTRANSCRIPT,function()
|
||||||
|
this.ShowRankingListInfo()
|
||||||
|
end,GuildTranscriptManager.GetCurBoss())
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
function this.ShowRanking()
|
|
||||||
this.Empty:SetActive(true)
|
|
||||||
end
|
|
||||||
function this.ShowBuffData()
|
function this.ShowBuffData()
|
||||||
curBuyIndex = GuildTranscriptManager.GetbuffCount()
|
curBuyIndex = GuildTranscriptManager.GetbuffCount()
|
||||||
local curguildCheckpointConfig = guildCheckpointConfig[GuildTranscriptManager.GetCurBoss()]
|
local curguildCheckpointConfig = guildCheckpointConfig[GuildTranscriptManager.GetCurBoss()]
|
||||||
|
|
@ -377,9 +446,9 @@ this.timer = Timer.New()
|
||||||
--刷新倒计时显示
|
--刷新倒计时显示
|
||||||
function this.RemainTimeDown(_timeTextExpert,timeDown)
|
function this.RemainTimeDown(_timeTextExpert,timeDown)
|
||||||
if timeDown > 0 then
|
if timeDown > 0 then
|
||||||
if this.attackInfoTimeGo then
|
-- if this.attackInfoTimeGo then
|
||||||
this.attackInfoTimeGo:SetActive(true)
|
-- this.attackInfoTimeGo:SetActive(true)
|
||||||
end
|
-- end
|
||||||
if _timeTextExpert then
|
if _timeTextExpert then
|
||||||
_timeTextExpert.text = this.TimeStampToDateString(timeDown)
|
_timeTextExpert.text = this.TimeStampToDateString(timeDown)
|
||||||
end
|
end
|
||||||
|
|
@ -392,9 +461,10 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
|
||||||
_timeTextExpert.text = this.TimeStampToDateString(timeDown)
|
_timeTextExpert.text = this.TimeStampToDateString(timeDown)
|
||||||
end
|
end
|
||||||
if timeDown < 0 then
|
if timeDown < 0 then
|
||||||
if this.attackInfoTimeGo then
|
_timeTextExpert.text = ""
|
||||||
this.attackInfoTimeGo:SetActive(false)
|
-- if this.attackInfoTimeGo then
|
||||||
end
|
-- this.attackInfoTimeGo:SetActive(false)
|
||||||
|
-- end
|
||||||
this.timer:Stop()
|
this.timer:Stop()
|
||||||
this.timer = nil
|
this.timer = nil
|
||||||
end
|
end
|
||||||
|
|
@ -402,11 +472,13 @@ function this.RemainTimeDown(_timeTextExpert,timeDown)
|
||||||
end, 1, -1, true)
|
end, 1, -1, true)
|
||||||
this.timer:Start()
|
this.timer:Start()
|
||||||
else
|
else
|
||||||
LogGreen("ssssssssss")
|
|
||||||
if this.attackInfoTimeGo then
|
_timeTextExpert.text = ""
|
||||||
LogGreen("ssssssssss2")
|
-- LogGreen("ssssssssss")
|
||||||
this.attackInfoTimeGo:SetActive(false)
|
-- if this.attackInfoTimeGo then
|
||||||
end
|
-- LogGreen("ssssssssss2")
|
||||||
|
-- this.attackInfoTimeGo:SetActive(false)
|
||||||
|
-- end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
function this.TimeStampToDateString(second)
|
function this.TimeStampToDateString(second)
|
||||||
|
|
@ -416,6 +488,14 @@ function this.TimeStampToDateString(second)
|
||||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||||
return string.format("(%s:%s:%s:后失效)", hour, minute, sec)
|
return string.format("(%s:%s:%s:后失效)", hour, minute, sec)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.SetSelectImagePos(parent)
|
||||||
|
Util.SetGray(this.SelectImage,false)
|
||||||
|
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()
|
function GuildTranscriptMainPopup:OnClose()
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,7 @@ local curBoss = 1--当前bossId
|
||||||
local blood = 0--剩余血量万分比
|
local blood = 0--剩余血量万分比
|
||||||
local canSweep = 0--是否能扫荡,今天是否挑战过这个boss
|
local canSweep = 0--是否能扫荡,今天是否挑战过这个boss
|
||||||
local isKill = 0 --当场战斗boss 是否击杀
|
local isKill = 0 --当场战斗boss 是否击杀
|
||||||
|
local isKillShowTip = false --当场战斗boss 是否击杀
|
||||||
local buffCount = 0--当前buff到多少索引
|
local buffCount = 0--当前buff到多少索引
|
||||||
local buffTime = 0--buff结束时间
|
local buffTime = 0--buff结束时间
|
||||||
|
|
||||||
|
|
@ -34,7 +35,9 @@ function this.GetGuildChallengeInfoRequest(fun)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
--请求战斗
|
--请求战斗
|
||||||
|
local attackTypeShotTime
|
||||||
function this.GuildChallengeRequest(attackType,callBack)
|
function this.GuildChallengeRequest(attackType,callBack)
|
||||||
|
attackTypeShotTime = attackType
|
||||||
if attackType == 0 then
|
if attackType == 0 then
|
||||||
NetManager.GuildChallengeRequest(this.GetCurBoss(),attackType,function (msg)
|
NetManager.GuildChallengeRequest(this.GetCurBoss(),attackType,function (msg)
|
||||||
local fightData = BattleManager.GetBattleServerData(msg)
|
local fightData = BattleManager.GetBattleServerData(msg)
|
||||||
|
|
@ -43,6 +46,7 @@ function this.GuildChallengeRequest(attackType,callBack)
|
||||||
canSweep = 1
|
canSweep = 1
|
||||||
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
|
PrivilegeManager.RefreshPrivilegeUsedTimes(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM, 1)--更新特权
|
||||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GuildTranscript, callBack)
|
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.GuildTranscript, callBack)
|
||||||
|
CheckRedPointStatus(RedPointType.Guild_Transcript)
|
||||||
end)
|
end)
|
||||||
elseif attackType == 1 then--快速战斗 扫荡
|
elseif attackType == 1 then--快速战斗 扫荡
|
||||||
NetManager.GuildChallengeRequest(this.GetCurBoss(),attackType,function (msg)
|
NetManager.GuildChallengeRequest(this.GetCurBoss(),attackType,function (msg)
|
||||||
|
|
@ -53,18 +57,25 @@ function this.GuildChallengeRequest(attackType,callBack)
|
||||||
callBack()
|
callBack()
|
||||||
end
|
end
|
||||||
end, 6,true,true)
|
end, 6,true,true)
|
||||||
|
CheckRedPointStatus(RedPointType.Guild_Transcript)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
local oldBossId = 0
|
||||||
function this.RefreshGuildTranscriptInfo(msg)
|
function this.RefreshGuildTranscriptInfo(msg)
|
||||||
local oldBossId = curBoss
|
oldBossId = curBoss
|
||||||
|
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--剩余血量万分比
|
||||||
-- canSweep = msg.canSweep--是否能扫荡,今天是否挑战过这个boss
|
-- canSweep = msg.canSweep--是否能扫荡,今天是否挑战过这个boss
|
||||||
isKill = msg.isKill--是否击杀
|
isKill = msg.isKill--是否击杀
|
||||||
|
isKillShowTip = false
|
||||||
if msg.isKill == 1 then
|
if msg.isKill == 1 then
|
||||||
PopupTipPanel.ShowTip("已击败【首领名称】!")
|
isKillShowTip = true
|
||||||
-- canSweep = 0
|
if attackTypeShotTime == 1 then
|
||||||
|
local monsterData = this.GetMonsterConfigDataById(oldBossId)
|
||||||
|
PopupTipPanel.ShowTip( string.format("已击败【%s】!",monsterData.ReadingName) )
|
||||||
|
end
|
||||||
end
|
end
|
||||||
if oldBossId ~= curBoss then--前后ID不等认为是击杀
|
if oldBossId ~= curBoss then--前后ID不等认为是击杀
|
||||||
canSweep = 0
|
canSweep = 0
|
||||||
|
|
@ -74,11 +85,39 @@ function this.RefreshGuildTranscriptInfo(msg)
|
||||||
end
|
end
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscript)
|
||||||
end
|
end
|
||||||
|
function this.IsKillShowTip()
|
||||||
|
if isKillShowTip and attackTypeShotTime == 0 then
|
||||||
|
local monsterData = this.GetMonsterConfigDataById(oldBossId)
|
||||||
|
PopupTipPanel.ShowTip( string.format("已击败【%s】!",monsterData.ReadingName) )
|
||||||
|
end
|
||||||
|
end
|
||||||
function this.RefreshGuildTranscriptBuffInfo(msg)
|
function this.RefreshGuildTranscriptBuffInfo(msg)
|
||||||
|
LogGreen("msg.buffCount "..msg.buffCount.." msg.buffTime "..msg.buffTime)
|
||||||
buffCount = msg.buffCount
|
buffCount = msg.buffCount
|
||||||
buffTime = msg.buffTime
|
buffTime = msg.buffTime
|
||||||
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscriptBuff)
|
Game.GlobalEvent:DispatchEvent(GameEvent.Guild.RefreshGuildTranscriptBuff)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function this.GetMonsterConfigDataById(chapterId)
|
||||||
|
local MonsterId = ConfigManager.GetConfigData(ConfigName.GuildCheckpointConfig,chapterId).MonsterId
|
||||||
|
local monsterConFig = nil
|
||||||
|
local monsterGrip = ConfigManager.GetConfigData(ConfigName.MonsterGroup,MonsterId)
|
||||||
|
if not monsterGrip then return nil end
|
||||||
|
local monsterId = 0
|
||||||
|
for i = 1, #monsterGrip.Contents do
|
||||||
|
if monsterId <= 0 then
|
||||||
|
for j = 1, #monsterGrip.Contents[i] do
|
||||||
|
if monsterGrip.Contents[i][j] > 0 then
|
||||||
|
monsterId = monsterGrip.Contents[i][j]
|
||||||
|
break
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if monsterId <= 0 then return nil end
|
||||||
|
local monsterData = ConfigManager.GetConfigData(ConfigName.MonsterConfig,monsterId)
|
||||||
|
return monsterData
|
||||||
|
end
|
||||||
-- 获取剩余挑战次数 特权
|
-- 获取剩余挑战次数 特权
|
||||||
function this.GetCanBattleCount()
|
function this.GetCanBattleCount()
|
||||||
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
return PrivilegeManager.GetPrivilegeRemainValue(PRIVILEGE_TYPE.GUILDTRANSCRIPT_BATTLENUM)
|
||||||
|
|
|
||||||
|
|
@ -73,14 +73,14 @@ local _GuildBuildConfig = {
|
||||||
rpType = RedPointType.Guild_Skill,
|
rpType = RedPointType.Guild_Skill,
|
||||||
rpPos = Vector3.New(53, 137, 0),
|
rpPos = Vector3.New(53, 137, 0),
|
||||||
},
|
},
|
||||||
-- [GUILD_MAP_BUILD_TYPE.CARDELAY] = { --车迟斗法
|
[GUILD_MAP_BUILD_TYPE.BOSS] = { --公会副本
|
||||||
-- bgImg = "r_gonghui_qizhi",
|
bgImg = "r_gonghui_qizhi",
|
||||||
-- nameImg = "r_gonghui_chechidoufa",
|
nameImg = "r_gonghui_zhao",
|
||||||
-- pos = Vector3.New(2626, -761, 0),
|
pos = Vector3.New(266, -158, 0),
|
||||||
-- namePos = Vector3.New(0, 13.4, 0),
|
namePos = Vector3.New(0, 13.4, 0),
|
||||||
-- rpType = RedPointType.Guild_CarDeleay,
|
rpType = RedPointType.Guild_Transcript,
|
||||||
-- rpPos = Vector3.New(53, 137, 0),
|
rpPos = Vector3.New(53, 137, 0),
|
||||||
-- },
|
},
|
||||||
[GUILD_MAP_BUILD_TYPE.AID] = { --援助
|
[GUILD_MAP_BUILD_TYPE.AID] = { --援助
|
||||||
bgImg = "r_gonghui_qizhi",
|
bgImg = "r_gonghui_qizhi",
|
||||||
nameImg = "r_gonghui_yuanzhu",
|
nameImg = "r_gonghui_yuanzhu",
|
||||||
|
|
|
||||||
|
|
@ -229,6 +229,7 @@ function this.InitRedPointAllRelate()
|
||||||
RPData:SetParent(RedPointType.Guild_AidMy, RedPointType.Guild_Aid)
|
RPData:SetParent(RedPointType.Guild_AidMy, RedPointType.Guild_Aid)
|
||||||
RPData:SetParent(RedPointType.Guild_AidGuild, RedPointType.Guild_Aid)
|
RPData:SetParent(RedPointType.Guild_AidGuild, RedPointType.Guild_Aid)
|
||||||
RPData:SetParent(RedPointType.Guild_AidBox, 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_Skill, RedPointType.Guild)
|
||||||
RPData:SetParent(RedPointType.Guild_DeathPos, 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_Roam_Check, ShopManager.ShopRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.Shop_Guild_Check, ShopManager.ShopRedCheck)
|
RPData:AddCheckFunc(RedPointType.Shop_Guild_Check, ShopManager.ShopRedCheck)
|
||||||
RPData:AddCheckFunc(RedPointType.Guild_Shop, 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.VIP_SHOP_DETAIL, VipManager.CheckRedPoint)
|
||||||
RPData:AddCheckFunc(RedPointType.VipPrivilege, VipManager.CheckNewVipRP)
|
RPData:AddCheckFunc(RedPointType.VipPrivilege, VipManager.CheckNewVipRP)
|
||||||
RPData:AddCheckFunc(RedPointType.GrowthGift, OperatingManager.GetGrowthRedPointState)
|
RPData:AddCheckFunc(RedPointType.GrowthGift, OperatingManager.GetGrowthRedPointState)
|
||||||
|
|
|
||||||
|
|
@ -11,10 +11,11 @@ end
|
||||||
|
|
||||||
|
|
||||||
--初始化排行数据(待优化)
|
--初始化排行数据(待优化)
|
||||||
function this.InitData(rankType,fun)
|
function this.InitData(rankType,fun,id)
|
||||||
|
local activiteId = (id ~= nil and id > 0) and id or nil--点金时需要 当为公会副本是为章节id
|
||||||
NetManager.RequestRankInfo(rankType, function (msg)--请求数据
|
NetManager.RequestRankInfo(rankType, function (msg)--请求数据
|
||||||
this.ReceiveRankingData(msg,fun)
|
this.ReceiveRankingData(msg,fun)
|
||||||
end,0)
|
end,activiteId)
|
||||||
end
|
end
|
||||||
|
|
||||||
---战力战力
|
---战力战力
|
||||||
|
|
|
||||||
|
|
@ -105,9 +105,10 @@ end
|
||||||
function this.GetRankInfo(rankType)
|
function this.GetRankInfo(rankType)
|
||||||
RankingManager.CurPage=0
|
RankingManager.CurPage=0
|
||||||
this.istop=true
|
this.istop=true
|
||||||
|
local curActivity = sData.activiteId > 0 and ActivityGiftManager.GetActivityIdByType(sData.activiteId) or nil
|
||||||
RankingManager.InitData(rankType,function()
|
RankingManager.InitData(rankType,function()
|
||||||
this.SetRankingInfo()
|
this.SetRankingInfo()
|
||||||
end)
|
end,curActivity)
|
||||||
end
|
end
|
||||||
|
|
||||||
---设置排名信息
|
---设置排名信息
|
||||||
|
|
@ -357,6 +358,11 @@ function this.SetInfoShow(go,data,rankType,Value0)
|
||||||
end
|
end
|
||||||
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
|
Util.GetGameObject(go,"goldExper/Text"):GetComponent("Text").text = data.rankInfo.param1
|
||||||
end
|
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
|
elseif rankType == RANK_TYPE.ARENA_RANK then
|
||||||
-- if data.personInfo.score and data.personInfo.score > 0 then
|
-- if data.personInfo.score and data.personInfo.score > 0 then
|
||||||
arenaScore:SetActive(true)
|
arenaScore:SetActive(true)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue