【玉虚论道】=====修改对战完 点击确定主城列表不刷新问题
parent
9303bfc856
commit
bc37810f8b
|
@ -65,9 +65,7 @@ local function OnEndDrag(self, Pointgo, data)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
--如果滑动距离太短,阵容放回原来的地方
|
--如果滑动距离太短,阵容放回原来的地方
|
||||||
LogError(" num=="..num)
|
|
||||||
if num>100 then
|
if num>100 then
|
||||||
LogError("**********")
|
|
||||||
local target=Util.GetGameObject(self.tempInfo.transform, "Demons")
|
local target=Util.GetGameObject(self.tempInfo.transform, "Demons")
|
||||||
target.transform:SetParent(self.oldGrid.transform)
|
target.transform:SetParent(self.oldGrid.transform)
|
||||||
target.transform:SetSiblingIndex(1)
|
target.transform:SetSiblingIndex(1)
|
||||||
|
@ -81,7 +79,6 @@ local function OnEndDrag(self, Pointgo, data)
|
||||||
targetInfo.transform:SetSiblingIndex(1)
|
targetInfo.transform:SetSiblingIndex(1)
|
||||||
targetInfo.transform.localPosition=Vector3.New(0,-67,0)
|
targetInfo.transform.localPosition=Vector3.New(0,-67,0)
|
||||||
else
|
else
|
||||||
LogError("targetInfo==nil")
|
|
||||||
local target=Util.GetGameObject(self.tempInfo.transform, "Demons")
|
local target=Util.GetGameObject(self.tempInfo.transform, "Demons")
|
||||||
target.transform:SetParent(self.oldGrid.transform)
|
target.transform:SetParent(self.oldGrid.transform)
|
||||||
target.transform:SetSiblingIndex(1)
|
target.transform:SetSiblingIndex(1)
|
||||||
|
@ -97,7 +94,6 @@ local function OnEndDrag(self, Pointgo, data)
|
||||||
curInfo:SetParent(obj.transform)
|
curInfo:SetParent(obj.transform)
|
||||||
curInfo.transform:SetSiblingIndex(1)
|
curInfo.transform:SetSiblingIndex(1)
|
||||||
curInfo.localPosition = Vector3.New(0,-67,0)
|
curInfo.localPosition = Vector3.New(0,-67,0)
|
||||||
LogError("起始id=="..currIndex.." 终点id=="..targetIndex)
|
|
||||||
--发送协议保存队伍
|
--发送协议保存队伍
|
||||||
if currIndex ~= targetIndex then
|
if currIndex ~= targetIndex then
|
||||||
-- 交换编队数据
|
-- 交换编队数据
|
||||||
|
@ -249,6 +245,10 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip(Language[10075])
|
PopupTipPanel.ShowTip(Language[10075])
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
if type~=1 then
|
||||||
|
self:ClosePanel()
|
||||||
|
return
|
||||||
|
end
|
||||||
-- 动画中不能再执行
|
-- 动画中不能再执行
|
||||||
state=2
|
state=2
|
||||||
if isAnim then
|
if isAnim then
|
||||||
|
@ -258,10 +258,7 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
||||||
PopupTipPanel.ShowTip("编队为空,无法挑战")
|
PopupTipPanel.ShowTip("编队为空,无法挑战")
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if type~=1 then
|
|
||||||
self:ClosePanel()
|
|
||||||
return
|
|
||||||
end
|
|
||||||
local list={2001,2002,2003}
|
local list={2001,2002,2003}
|
||||||
|
|
||||||
local num=PrivilegeManager.GetPrivilegeRemainValue(0)
|
local num=PrivilegeManager.GetPrivilegeRemainValue(0)
|
||||||
|
@ -307,10 +304,8 @@ function WorldArenaBattleInfoPanel:BindEvent()
|
||||||
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
|
this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED
|
||||||
WorldArenaManager.SetNewScore(msg.myNewScore)
|
WorldArenaManager.SetNewScore(msg.myNewScore)
|
||||||
WorldArenaManager.SetMyData(msg.myRank,WorldArenaManager.GetchallengeTimes()+1)
|
WorldArenaManager.SetMyData(msg.myRank,WorldArenaManager.GetchallengeTimes()+1)
|
||||||
LogError("myscore=="..msg.myScore.."defScore=="..msg.defScore.." rank=="..msg.myRank.." challengetime=="..msg.changedTimes.." myNewScore=="..msg.myNewScore)
|
|
||||||
--添加奖励 --
|
--添加奖励 --
|
||||||
if msg.drop then
|
if msg.drop then
|
||||||
LogError("掉落物品数量:"..#msg.drop)
|
|
||||||
WorldArenaManager.AddReward(msg.drop)
|
WorldArenaManager.AddReward(msg.drop)
|
||||||
end
|
end
|
||||||
if num>0 then
|
if num>0 then
|
||||||
|
@ -589,7 +584,7 @@ function this:OnClose()
|
||||||
this.TimeCounter:Stop()
|
this.TimeCounter:Stop()
|
||||||
this.TimeCounter = nil
|
this.TimeCounter = nil
|
||||||
end
|
end
|
||||||
-- 执行关闭方法
|
-- 执行关闭方法u
|
||||||
if _CloseFunc then
|
if _CloseFunc then
|
||||||
-- 如果是挑战完成了,返回就刷新挑战列表
|
-- 如果是挑战完成了,返回就刷新挑战列表
|
||||||
if state == 3 then
|
if state == 3 then
|
||||||
|
|
|
@ -95,7 +95,6 @@ function WorldArenaMainPanel:BindEvent()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,enemyList[i],function(msg)
|
NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,enemyList[i],function(msg)
|
||||||
LogError("open battleinfo ???")
|
|
||||||
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function()
|
UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function()
|
||||||
self:RefreshChallengeList()
|
self:RefreshChallengeList()
|
||||||
end)
|
end)
|
||||||
|
@ -190,12 +189,10 @@ function WorldArenaMainPanel:OnOpen(msg)
|
||||||
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",msg.oldMyscore)
|
PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",msg.oldMyscore)
|
||||||
end
|
end
|
||||||
local currRankId=msg.newLevelId
|
local currRankId=msg.newLevelId
|
||||||
LogError(" newMyscore=="..msg.newMyscore.." oldmyscore=="..msg.oldMyscore)
|
|
||||||
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
|
grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore)
|
||||||
oldScore=msg.oldMyscore
|
oldScore=msg.oldMyscore
|
||||||
--新赛季本地数据制成0
|
--新赛季本地数据制成0
|
||||||
if msg.drop and #msg.drop>0 then
|
if msg.drop and #msg.drop>0 then
|
||||||
LogError("有充值奖励")
|
|
||||||
WorldArenaManager.AddReward(msg.drop)
|
WorldArenaManager.AddReward(msg.drop)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
@ -210,7 +207,6 @@ function WorldArenaMainPanel:OnOpen(msg)
|
||||||
this.endTime.text="周日23:30赛季结束"
|
this.endTime.text="周日23:30赛季结束"
|
||||||
this:RefreshEnemyData(msg.arenaEnemys)
|
this:RefreshEnemyData(msg.arenaEnemys)
|
||||||
|
|
||||||
LogError(" main panel".." battletime=="..challengeTime.." rank=="..myRank.."freeTimes=="..freeTimes)
|
|
||||||
if freeTimes==0 then
|
if freeTimes==0 then
|
||||||
this.freeTimes.gameObject:SetActive(false)
|
this.freeTimes.gameObject:SetActive(false)
|
||||||
this.freeTimes.transform.parent.gameObject:SetActive(false)
|
this.freeTimes.transform.parent.gameObject:SetActive(false)
|
||||||
|
@ -218,7 +214,6 @@ function WorldArenaMainPanel:OnOpen(msg)
|
||||||
this.freeTimes.text = string.format("%s次", math.max(freeTimes, 0))
|
this.freeTimes.text = string.format("%s次", math.max(freeTimes, 0))
|
||||||
--检测段位是否发生变化
|
--检测段位是否发生变化
|
||||||
if msg.updrop and #msg.updrop>0 then
|
if msg.updrop and #msg.updrop>0 then
|
||||||
LogError("有升级奖励")
|
|
||||||
WorldArenaManager.AddReward(msg.updrop)
|
WorldArenaManager.AddReward(msg.updrop)
|
||||||
end
|
end
|
||||||
this.CheckIsRankChange(isReset)
|
this.CheckIsRankChange(isReset)
|
||||||
|
@ -393,7 +388,6 @@ end
|
||||||
|
|
||||||
function this.CheckIsRankChange(resetData)
|
function this.CheckIsRankChange(resetData)
|
||||||
local lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore")
|
local lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore")
|
||||||
LogError("lastscore=="..lastScore)
|
|
||||||
local aa,oldData=WorldArenaManager.GetRankImgByScore(lastScore)
|
local aa,oldData=WorldArenaManager.GetRankImgByScore(lastScore)
|
||||||
--如果有段位变化就显示段位变化界面
|
--如果有段位变化就显示段位变化界面
|
||||||
if oldData.Id~=rankData.Id then
|
if oldData.Id~=rankData.Id then
|
||||||
|
|
Loading…
Reference in New Issue