From 991fb61f57ef1f990c78f75febbca77f947cfb42 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 20 Apr 2021 20:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=8B=B1=E9=9B=84=E5=8D=87=E6=98=9F?= =?UTF-8?q?=E7=A5=AD=E5=93=81=E3=80=91=E6=8F=90=E4=BA=A4=E2=80=94=E2=80=94?= =?UTF-8?q?6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleAwakeLayout.lua | 40 +++++++++---------- .../Modules/RoleInfo/RoleUpStarLayout.lua | 4 +- .../Modules/RoleInfo/RoleUpStarListPanel.lua | 1 - 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua index f26512bb60..f11a8c6322 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua @@ -65,17 +65,17 @@ end function RoleAwakeLayout:BindEvent() --升星 Util.AddOnceClick(this.upStarBtn, function() - this.StarUpClick() + self:StarUpClick() end) end --添加事件监听(用于子类重写) function RoleAwakeLayout:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.UpdateHeroUpStarMaterialShow) + Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.UpdateHeroUpStarMaterialShow,self) end --移除事件监听(用于子类重写) function RoleAwakeLayout:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold,this.UpdateHeroUpStarMaterialShow) + Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold,this.UpdateHeroUpStarMaterialShow,self) end function RoleAwakeLayout:OnShow(_sortinglayer,_parent,_curHerodata,_isUpZhen,_heroDatas) @@ -85,8 +85,8 @@ function RoleAwakeLayout:OnShow(_sortinglayer,_parent,_curHerodata,_isUpZhen,_he parent = _parent heroDatas = _heroDatas isUpZhen = _isUpZhen - this.GetCurHeroUpLvOrUpStarSData() - this.UpdateHeroUpStarData()--进阶 + self:GetCurHeroUpLvOrUpStarSData() + self:UpdateHeroUpStarData()--进阶 end function RoleAwakeLayout:OnShow() @@ -99,14 +99,14 @@ function RoleAwakeLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_h parent = _parent heroDatas = _heroDatas isUpZhen = _isUpZhen - this.GetCurHeroUpLvOrUpStarSData() - this.UpdateHeroUpStarData()--进阶 + self:GetCurHeroUpLvOrUpStarSData() + self:UpdateHeroUpStarData()--进阶 end --更新英雄进阶数据 -function this.UpdateHeroUpStarData() +function RoleAwakeLayout:UpdateHeroUpStarData() --进阶材料 - this.UpdateHeroUpStarMaterialShow() + self:UpdateHeroUpStarMaterialShow() --进阶属性提升 this.curLvEnd.text= HeroManager.GetCurHeroStarLvEnd(1,curHeroData) this.nextLvEnd.text= HeroManager.GetCurHeroStarLvEnd(2,curHeroData,curHeroData.breakId,upStarRankUpConfig.Id) @@ -171,16 +171,16 @@ function this.UpdateHeroUpStarData() Util.AddOnceClick(addBtn, function() curSelectUpStarData=curUpStarData[i] curSelectUpStarGo=go - local curShowHeroListData=this.SetShowHeroListData(upStarConsumeMaterial,upStarHeroListData.heroList) + local curShowHeroListData=self:SetShowHeroListData(upStarConsumeMaterial,upStarHeroListData.heroList) --参数1 显示的herolist 2 3 升当前星的规则 4 打开RoleUpStarListPanel的界面 UIManager.OpenPanel(UIName.RoleUpStarListPanel,curShowHeroListData,curUpStarData[i].upStarMaterialsData,curUpStarData[i].upStarData,this,upStarConsumeMaterial[i],curHeroData) end) end end - this.AutoSelectUpStarHeroList(curUpStarData) + self:AutoSelectUpStarHeroList(curUpStarData) end --获取当前英雄的下一突破 和 升星 静态数据 -function this.GetCurHeroUpLvOrUpStarSData() +function RoleAwakeLayout:GetCurHeroUpLvOrUpStarSData() isHeroUpStar = false upStarRankUpConfig = {} local heroRankUpConfig = ConfigManager.GetConfig(ConfigName.HeroRankupConfig) @@ -197,7 +197,7 @@ function this.GetCurHeroUpLvOrUpStarSData() end end --更新英雄进阶材料显示 -function this.UpdateHeroUpStarMaterialShow() +function RoleAwakeLayout:UpdateHeroUpStarMaterialShow() --进阶金币 妖壶条件 if upStarRankUpConfig then isUpStarMaterials=true @@ -238,7 +238,7 @@ function this.UpdateHeroUpStarMaterialShow() end --升星选择祭品后刷新界面 -function this.AutoSelectUpStarHeroList(_curUpStarData) +function RoleAwakeLayout:AutoSelectUpStarHeroList(_curUpStarData) local curUpStarData= _curUpStarData if curUpStarData and #curUpStarData>0 then for i = 1, #curUpStarData do @@ -257,7 +257,7 @@ function this.AutoSelectUpStarHeroList(_curUpStarData) table.insert(curSelectHeroList,upStarHeroListData.heroList[i]) end end - this.UpdateUpStarPosHeroData(curSelectHeroList) + self:UpdateUpStarPosHeroData(curSelectHeroList) end end end @@ -270,7 +270,7 @@ end --刷新当前升星坑位英雄的信息 -function this.UpdateUpStarPosHeroData(curSelectHeroList) +function RoleAwakeLayout:UpdateUpStarPosHeroData(curSelectHeroList) if LengthOfTable(curSelectHeroList)=HeroManager.heroLvEnd[curHeroData.heroConfig.Id] then PopupTipPanel.ShowTip(Language[11788]) return @@ -349,7 +349,7 @@ function this.StarUpClick() end if isUpStarMaterials and isUpStarMaterialsHero then NetManager.HeroUpStarEvent(curHeroData.dynamicId,upStarConsumeMaterial ,function (msg) - this.DeleteUpStarMaterials() + self:DeleteUpStarMaterials() UIManager.OpenPanel(UIName.RoleAwakeSuccessPanel,curHeroData,upStarRankUpConfig.Id,upStarRankUpConfig.OpenLevel,function () local dropItemTabs = BagManager.GetTableByBackDropData(msg) if #dropItemTabs > 0 then @@ -368,7 +368,7 @@ function this.StarUpClick() end end --扣除升星 消耗的材料 更新英雄数据 -function this.DeleteUpStarMaterials() +function RoleAwakeLayout:DeleteUpStarMaterials() HeroManager.UpdateSingleHeroDatas(curHeroData.dynamicId,curHeroData.oriLv,curHeroData.star+1,curHeroData.breakId,upStarRankUpConfig.Id,true) HeroManager.UpdateSingleHeroSkillData(curHeroData.dynamicId) for i, v in pairs(heroDatas) do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua index 089641c8b2..bf6d3a7098 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua @@ -80,11 +80,11 @@ end --添加事件监听(用于子类重写) function RoleUpStarLayout:AddListener() - Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.UpdateHeroUpStarMaterialShow) + Game.GlobalEvent:AddEvent(GameEvent.Bag.BagGold, this.UpdateHeroUpStarMaterialShow,self) end --移除事件监听(用于子类重写) function RoleUpStarLayout:RemoveListener() - Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold,this.UpdateHeroUpStarMaterialShow) + Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold,this.UpdateHeroUpStarMaterialShow,self) end function RoleUpStarLayout:OnShow() diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 03bd21f764..272f089586 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -41,7 +41,6 @@ function RoleUpStarListPanel:BindEvent() end) Util.AddClick(this.BtnSure, function() self:ClosePanel() - Log("curSelectHeroList "..LengthOfTable(curSelectHeroList)) openThisPanel:UpdateUpStarPosHeroData(curSelectHeroList) end) Util.AddClick(this.btnAutoSelect, function()