Merge branches 'china/dev' and 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-03-26 13:49:56 +08:00
commit 3c31b5b5bd
4 changed files with 14 additions and 9 deletions

View File

@ -180,7 +180,7 @@ function this:OnSortingOrderChange(battleSorting)
this.FirstEffect:GetComponent("Canvas").sortingOrder = battleSorting + 30
this.skillEffectRoot:GetComponent("Canvas").sortingOrder = battleSorting + 40
local skillSorting = battleSorting + 300
local skillSorting = battleSorting + 90
this.mySkillCast:GetComponent("Canvas").sortingOrder = skillSorting
this.enemySkillCast:GetComponent("Canvas").sortingOrder = skillSorting

View File

@ -284,8 +284,8 @@ function this.ChatDataAdapter(channel, data)
if newMsgId ~= -1 then -- 消息号为-1表示屏蔽消息保存数据但不保存消息号
this.SetMsgIdFlag(channel, newMsgId) -- 保存当前消息的消息号,避免下次刷新时还会请求
end
__DebugLog(Language[10363]..tostring(tonumber(newChat.times) <= this.LoginTimeStamp))
if tonumber(newChat.times) > this.LoginTimeStamp then -- 登录时间之前的消息都不显示
-- __DebugLog(Language[10363]..tostring(tonumber(newChat.times) <= this.LoginTimeStamp))
-- if tonumber(newChat.times) > this.LoginTimeStamp - 7200000 then -- 登录时间之前的消息都不显示
if channel ~= CHAT_CHANNEL.SYSTEM or this.IsShowInChatPanel(newChat.messageType) then
if not GoodFriendManager.IsInBlackList(newChat.senderId) then -- 判断是否在黑名单中
table.insert(this.ChatList[channel], newChat)
@ -298,7 +298,7 @@ function this.ChatDataAdapter(channel, data)
if this.IsShowInHorseRace(newChat.messageType) then
HorseRaceManager.AddRaceData(newChat)
end
end
-- end
end
__DebugLog("--")
end

View File

@ -129,7 +129,7 @@ function this.RefreshRank(index)
RankingManager.InitData(curRankType,function()--RANK_TYPE.GUILD_DEATHPOS_ALLGUILD
local ranks,myRankInfo = RankingManager.GetRankingInfo()
this.empty:SetActive(#ranks<=0)
this.SetScrollView(ranks,curRankType)
this.SetScrollView(ranks, curRankType, true)
this.scrollView:SetIndex(1)
--当我的排名没数据时
this.mRSortNum:SetActive(myRankInfo.rank~=-1)
@ -143,16 +143,16 @@ function this.RefreshRank(index)
end,nil,1)
end
function this.SetScrollView(ranks,curRankType)
function this.SetScrollView(ranks,curRankType, isTop)
this.scrollView:SetData(ranks,function(index,root)
this.SetScrollPre(root,ranks[index],curRankType)
if index==#ranks then
RankingManager.RequestNextWarPowerPageData(function()
local ranks,myRankInfo = RankingManager.GetRankingInfo()
this.SetScrollView(ranks)
this.SetScrollView(ranks, curRankType, false)
end)
end
end)
end, not isTop, true)
end
--设置每条数据
function this.SetScrollPre(root,data,curRankType)

View File

@ -17,8 +17,12 @@ end
--绑定事件(用于子类重写)
function BattleFailPopup:BindEvent()
Util.AddClick(this.btnClose, function ()
-- 三秒后才能关闭
if GetTimeStamp() - this.openTime < 1 then
return
end
this.ClosePanelRefreshData()
if m_battlePanel then
m_battlePanel:ClosePanel()
@ -70,6 +74,7 @@ end
--界面打开时调用(用于子类重写)
function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType)
this.openTime = GetTimeStamp()
LogGreen("isBackBattle = false")
isBackBattle = false
if battlePanel then