diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index 4ad7da6d33..5e2932949b 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -260,7 +260,7 @@ function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTim end end if itemId == 16 and state == 0 then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,generalType, + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,self.tenRecruit.Id, function() RecruitManager.RecruitRequest(id,function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index 7c9bbbf1d2..29f042d006 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -75,13 +75,14 @@ function TimeLimitUpHero:InitComponent() self.xianshishangshiBtn = Util.GetGameObject(self.gameObject,"btngroup/xianshishangshiBtn") self.xxssEffect = Util.GetGameObject(self.xianshishangshiBtn,"Fx_Circle 1") + self.xianshishangshiBtn:SetActive(false) end --绑定事件(用于子类重写) function TimeLimitUpHero:BindEvent() - Util.AddOnceClick(self.xianshishangshiBtn, function() - JumpManager.GoJump(40014) - end) + -- Util.AddOnceClick(self.xianshishangshiBtn, function() + -- JumpManager.GoJump(40014) + -- end) Util.AddClick(self.btn_hero.gameObject, function() UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.ChooseUpHero,self.actId,curHeroId) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua index 284163dbf1..a47216cddb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpHero.lua @@ -72,7 +72,7 @@ function this:OnShow(_parent,_args) args = _args parent=_parent sortingOrder =_parent.sortingOrder - this:Refresh(1) + this:Refresh(heroConfig[args[2]].PropertyName) end function this:Refresh(_page) curPage = _page diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua index 40c96d93d2..b27950127c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_LingShouBaoGe.lua @@ -130,6 +130,7 @@ function this:OnDestroy() itemsGrid = {}--item重复利用 itemViewGrid = {} itemGoGrid = {} + sortingOrder=0 end return this \ No newline at end of file