From aaa4b987eb084a622b4f66760d6dda674d135c1c Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Sat, 11 Sep 2021 19:47:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=89=E8=99=9A=E8=AE=BA=E9=81=93=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 3 ++- .../Modules/Formation/View/WorldArenaFormation.lua | 7 +++++-- .../Modules/WorldArena/WorldArenaBattleInfoPanel.lua | 11 +++++------ .../~Lua/Modules/WorldArena/WorldArenaMainPanel.lua | 1 - Assets/ManagedResources/~Lua/View/UpView.lua | 4 +++- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f4f0f002a1..bcbb4ded0b 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -486,7 +486,7 @@ PanelType = { XiangYaoDuoBao = {14,16,1220},--降妖夺宝 NiuQiChongTian = {14,16,1300},--牛气冲天 XiuXing = {14,16,1226},--修行 - WorldArena = { 14,16,106}, --玉虚论道 + WorldArena = { 107,16,106}, --玉虚论道 } @@ -552,6 +552,7 @@ UpViewRechargeType = { LuoFuJingShi = 1207,--罗浮晶石 SuiFanXingCheng = 1007, -- 碎繁星辰 yuxulundaoTicket=106, --玉虚论道邀请函 + LunDaoBi=107, --论道币 } SHOP_PAGE = { diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/WorldArenaFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/WorldArenaFormation.lua index 7a8d795890..707aff7065 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/WorldArenaFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/WorldArenaFormation.lua @@ -287,8 +287,11 @@ end -- 获取要显示得英雄列表 -function this.GetHeroList() - return HeroManager.GetAllHeroDatas() +function this.GetHeroList(proId) + if not proId or proId==0 then + return HeroManager.GetAllHeroDatas() + end + return HeroManager.GetHeroDataByProperty(proId) end -- 获取一键上阵所需要的英雄列表 diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua index 89b8a946ac..c3da2ca944 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaBattleInfoPanel.lua @@ -256,7 +256,6 @@ function WorldArenaBattleInfoPanel:BindEvent() end end NetManager.CrossYuXuLunDaoChallengeRequest(list,enemyId,costType,function(msg) - LogError("战斗结束") resultList=msg.fightResult fightDataList=msg.fightData isAnim = true @@ -296,17 +295,17 @@ function WorldArenaBattleInfoPanel:BindEvent() for i = 1, #this.playBacks do Util.AddClick(this.playBacks[i],function() - if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then - PopupTipPanel.ShowTip("本场战斗无法回放!") - return - end - + -- if not leftAllTeam[i] or not rightAllTeam[i] or #leftAllTeam[i]==0 or #rightAllTeam[i]==0 then + -- PopupTipPanel.ShowTip("本场战斗无法回放!") + -- return + -- end local nameStr = myInfoData.name.."|"..enInfoData.name local realResult = resultList[i] --(resultList[i] + 1) % 2 -- 服务器返回的是我的结果,转换为真实结果 this.RequestReplayRecord(realResult,fightDataList[i], nameStr,function() --this:ClosePanel() --构建显示结果数据(我永远在蓝方) local arg = {} + arg.panelType=1 arg.result = realResult arg.blue = {} arg.blue.uid = myInfoData.uid diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua index 879aa1cdca..e9cef8a986 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaMainPanel.lua @@ -399,7 +399,6 @@ end -- 打开,重新打开时回调 function WorldArenaMainPanel:OnShow() SoundManager.PlayMusic(SoundConfig.BGM_Arena) - LogError("**********") end function WorldArenaMainPanel:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 45fd803c20..2751b82e8d 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -57,6 +57,7 @@ local _ShowPlusType = { UpViewRechargeType.SuiFanXingCheng, UpViewRechargeType.LuoFuJingShi, UpViewRechargeType.yuxulundaoTicket, + UpViewRechargeType.LunDaoBi, } -- 判断是否显示加号 @@ -383,7 +384,8 @@ function UpView:RechargeType(_type) _type==UpViewRechargeType.XuanHuangZhiQi or _type==UpViewRechargeType.LuoFuJingShi or _type==UpViewRechargeType.XiuXian or - _type==UpViewRechargeType.SuiFanXingCheng then + _type==UpViewRechargeType.SuiFanXingCheng or + _type==UpViewRechargeType.LunDaoBi then UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type) end end