diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 35106d17d8..7aea9521bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -576,7 +576,7 @@ function this.GoJumpWithoutTip(_jumpId) end end -function this.GoJump(_jumpId) +function this.GoJump(_jumpId,fun) local jumpSData = JumpConfig[_jumpId] if jumpSData then if jumpSData.Type < 10000 then @@ -594,6 +594,9 @@ function this.GoJump(_jumpId) jumpDic[jumpSData.Type](jumpSData.Skipfactor) end end + if fun then + fun() + end end function this.ShowGuide(panelId, targetGO) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 35d72e2431..5c1ffb03b2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -62,9 +62,7 @@ function RewardItemSingleShowPopup:BindEvent() NetManager.HeroComposeRequest(item,function (drop) this.SendBackCompoundReCallBack(drop) end) - if compoundNum>0 then - - else + if compoundNum<=0 then PopupTipPanel.ShowTip(Language[10200]) end else @@ -93,7 +91,7 @@ function RewardItemSingleShowPopup:BindEvent() UIManager.OpenPanel(UIName.CreateNamePopup) elseif itemConfigData.ItemType == ItemType.Skin then local group = ConfigManager.GetConfigData(ConfigName.RewardGroup,tonumber(itemConfig[itemSid].ResolveReward)).ShowItem - MsgPanel.ShowTwo(string.format("分解后可获得%s%s,是否继续分解",group[1][2],itemConfig[group[1][1]].Name),function() + MsgPanel.ShowTwo(string.format("分解后可获得%s%s,是否继续分解",group[1][2],itemConfig[group[1][1]].Name),function() end, function() local curResolveAllItemList = {} table.insert(curResolveAllItemList,{itemId = itemSid,itemNum = 1}) @@ -114,7 +112,7 @@ function RewardItemSingleShowPopup:BindEvent() local skinConfig = ConfigManager.GetConfigData(ConfigName.HeroSkin,itemSid) if HeroSkinManager.IsExist(skinConfig.Type) then PopupTipPanel.ShowTip("已解锁该皮肤,请在皮肤有效期之后再解锁") - else + else local curResolveAllItemList = {} table.insert(curResolveAllItemList,{itemId = itemSid,itemNum = 1}) NetManager.UseAndPriceItemRequest(0,curResolveAllItemList,function (drop) @@ -124,14 +122,16 @@ function RewardItemSingleShowPopup:BindEvent() local herodata = HeroManager.GetHeroDataByHeroSIdAndMinSortIdAndSkinId(skinConfig.HeroId,skinConfig.Type) LogGreen("herodata.dynamicId:"..tostring(herodata.dynamicId)) UIManager.OpenPanel(UIName.RoleInfoPanel,herodata, HeroManager.GetAllHeroDatas(),true,5) - end,"取消","确定","",false,"") + end,"取消","确定","",false,"") else PopupTipPanel.ShowTip(string.format("成功解锁皮肤%s",skinConfig.ReadingName)) - end + end end) end elseif itemConfigData then - JumpManager.GoJump(itemConfigData.UseJump) + JumpManager.GoJump(itemConfigData.UseJump,function () + this:ClosePanel() + end) end end) end