diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index fee5bb9ea7..eb2f09bd98 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -65,9 +65,7 @@ local function OnEndDrag(self, Pointgo, data) end end --如果滑动距离太短,阵容放回原来的地方 - LogError(" num=="..num) if num>100 then - LogError("**********") local target=Util.GetGameObject(self.tempInfo.transform, "Demons") target.transform:SetParent(self.oldGrid.transform) target.transform:SetSiblingIndex(1) @@ -81,7 +79,6 @@ local function OnEndDrag(self, Pointgo, data) targetInfo.transform:SetSiblingIndex(1) targetInfo.transform.localPosition=Vector3.New(0,-67,0) else - LogError("targetInfo==nil") local target=Util.GetGameObject(self.tempInfo.transform, "Demons") target.transform:SetParent(self.oldGrid.transform) target.transform:SetSiblingIndex(1) @@ -97,7 +94,6 @@ local function OnEndDrag(self, Pointgo, data) curInfo:SetParent(obj.transform) curInfo.transform:SetSiblingIndex(1) curInfo.localPosition = Vector3.New(0,-67,0) - LogError("起始id=="..currIndex.." 终点id=="..targetIndex) --发送协议保存队伍 if currIndex ~= targetIndex then -- 交换编队数据 @@ -249,6 +245,10 @@ function WorldArenaBattleInfoPanel:BindEvent() PopupTipPanel.ShowTip(Language[10075]) return end + if type~=1 then + self:ClosePanel() + return + end -- 动画中不能再执行 state=2 if isAnim then @@ -258,10 +258,7 @@ function WorldArenaBattleInfoPanel:BindEvent() PopupTipPanel.ShowTip("编队为空,无法挑战") return end - if type~=1 then - self:ClosePanel() - return - end + local list={2001,2002,2003} local num=PrivilegeManager.GetPrivilegeRemainValue(0) @@ -307,10 +304,8 @@ function WorldArenaBattleInfoPanel:BindEvent() this.enScore.color = msg.defScore>0 and UIColor.GREEN or UIColor.RED WorldArenaManager.SetNewScore(msg.myNewScore) 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 - LogError("掉落物品数量:"..#msg.drop) WorldArenaManager.AddReward(msg.drop) end if num>0 then @@ -589,7 +584,7 @@ function this:OnClose() this.TimeCounter:Stop() this.TimeCounter = nil end - -- 执行关闭方法 + -- 执行关闭方法u if _CloseFunc then -- 如果是挑战完成了,返回就刷新挑战列表 if state == 3 then diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index 493c757254..9b78770de2 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -95,7 +95,6 @@ function WorldArenaMainPanel:BindEvent() end end NetManager.CrossYuXuLunDaoChallengeBeforeRequest(PlayerManager.uid,enemyList[i],function(msg) - LogError("open battleinfo ???") UIManager.OpenPanel(UIName.WorldArenaBattleInfoPanel,msg,1, function() self:RefreshChallengeList() end) @@ -190,12 +189,10 @@ function WorldArenaMainPanel:OnOpen(msg) PlayerPrefs.SetInt(PlayerManager.uid.."yuxulundaoScore",msg.oldMyscore) end local currRankId=msg.newLevelId - LogError(" newMyscore=="..msg.newMyscore.." oldmyscore=="..msg.oldMyscore) grid, rankData=WorldArenaManager.GetRankImgByScore(msg.newMyscore) oldScore=msg.oldMyscore --新赛季本地数据制成0 if msg.drop and #msg.drop>0 then - LogError("有充值奖励") WorldArenaManager.AddReward(msg.drop) end @@ -210,7 +207,6 @@ function WorldArenaMainPanel:OnOpen(msg) this.endTime.text="周日23:30赛季结束" this:RefreshEnemyData(msg.arenaEnemys) - LogError(" main panel".." battletime=="..challengeTime.." rank=="..myRank.."freeTimes=="..freeTimes) if freeTimes==0 then this.freeTimes.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)) --检测段位是否发生变化 if msg.updrop and #msg.updrop>0 then - LogError("有升级奖励") WorldArenaManager.AddReward(msg.updrop) end this.CheckIsRankChange(isReset) @@ -393,7 +388,6 @@ end function this.CheckIsRankChange(resetData) local lastScore=PlayerPrefs.GetInt(PlayerManager.uid.."yuxulundaoScore") - LogError("lastscore=="..lastScore) local aa,oldData=WorldArenaManager.GetRankImgByScore(lastScore) --如果有段位变化就显示段位变化界面 if oldData.Id~=rankData.Id then