diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua index 66b8fe71fd..1f89fc8bb4 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_WishDraw.lua @@ -73,8 +73,13 @@ end function this:OnShow(_parent,...) self.parent=_parent self.sortingOrder = _parent.sortingOrder + local args = {...} NetManager.ChoiceWishHeroRequest(nil,function () - self.curSelect = RecruitManager.CheckIndex() + if args[1] then + self.curSelect = args[1] + else + self.curSelect = RecruitManager.CheckIndex() + end this:Refresh(true,true) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua index 410b13af1d..4cc74546f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guide/GuideManager.lua @@ -186,6 +186,7 @@ function this.CheckNextGuideListen(nextId) local type = GuideConfig[nextId].Type if openDic[type] then openDic[type] = nextId + LogGreen(" GuideConfig[nextId]:"..tostring(GuideConfig[nextId].BehaviorArgs) ) this.RefreshTriggerListen(nextId, GuideConfig[nextId].OpenType, GuideConfig[nextId].OpenArgs) end end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua index ea78b5ae74..9f03f326c5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitMainPanel.lua @@ -247,7 +247,14 @@ end --界面打开时调用(用于子类重写) function RecruitMainPanel:OnOpen(_index) if not _index then - self.CurRecruitId = RecruitManager.CurRecruitId + LogGreen("GuideManager.GetCurId(1):"..tostring(GuideManager.GetCurId(1)) ) + if GuideManager.IsInMainGuide() and GuideManager.GetCurId(1) == 105 then + self.CurRecruitId = TableRecruitType.Putong + elseif GuideManager.IsInMainGuide() and GuideManager.GetCurId(1) == 1003 then + self.CurRecruitId = TableRecruitType.Shenjiang + else + self.CurRecruitId = RecruitManager.CurRecruitId + end else self.CurRecruitId = _index RecruitManager.CurRecruitId = _index diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua index 297d24585f..9405b267fa 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanelNew.lua @@ -128,6 +128,7 @@ end function RecruitPanelNew:OnOpen(_Config,_index, parent) self.config = _Config self.parent = parent + self.gameObject.name = "RecruitPanelNew"..self.config.Id end function RecruitPanelNew:OnShow(sortingOrder)