From 763c45ebd01b47d55e4679d6d21ddc3084c15ec1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 12 Jul 2021 11:13:12 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E3=80=90ID1017258=E3=80=91=20=E3=80=90?= =?UTF-8?q?=E7=A2=8E=E7=89=87=E5=90=88=E6=88=90=E3=80=91=E7=A2=8E=E7=89=87?= =?UTF-8?q?=E4=BB=85=E5=A4=9F=E5=90=88=E6=88=90=E4=B8=80=E4=B8=AA=E7=A5=9E?= =?UTF-8?q?=E5=B0=86=E6=97=B6=EF=BC=8C=E5=90=88=E6=88=90=E5=90=8E=E4=B8=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=85=B3=E9=97=AD=E9=81=93=E5=85=B7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 7371405fbd76df0a468cbb24179ebf790cdb4cc6) --- .../Modules/Popup/RewardItemSingleShowPopup.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua index 4509805da1..e09a5b3b2d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua @@ -80,14 +80,11 @@ function RewardItemSingleShowPopup:BindEvent() item.itemNum=compoundNum*_itemData.itemConfig.UsePerCount if endHeroNum > 0 then NetManager.HeroComposeRequest(item,function (drop) - self:ClosePanel() - UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function () - end,nil,nil,nil,true) + this.SendBackCompoundReCallBack(drop) end) if compoundNum<=0 then PopupTipPanel.ShowTip(Language[10183]) end - else PopupTipPanel.ShowTip(Language[12157]) end @@ -226,11 +223,19 @@ end local callBackFun function this.SendBackCompoundReCallBack(drop) + --this:ClosePanel() UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function () + --UIManager.OpenPanel(UIName.BagPanel) + -- if callBackFun then + -- callBackFun() func() + -- end end,nil,nil,nil,true) + --改为后端刷新了 + --BagManager.UpdateItemsNum(itemData.id,compoundNum*itemData.itemConfig.UsePerCount) end + --扣除解锁蓝图材料 并数据 function this.DeleteActiveLanTuData() PopupTipPanel.ShowTip(Language[11515] .. GetLanguageStrById(itemConfigData.Name)) From 58b2c30ea938257de06ffa552895f859de4c883b Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 12 Jul 2021 15:59:14 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E3=80=90=E8=A7=92=E8=89=B2=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E3=80=91=E4=BF=AE=E5=A4=8D=E5=8D=87=E7=BA=A7=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index b50969de8c..ab089cd163 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -475,7 +475,8 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) else if isUpLvMaterials then if isSingleLvUp then--是否是单次升级 - if not curTuPoRankUpConfig or curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then + -- 当突破等级为0 最高等级为30级 + if (not curTuPoRankUpConfig and curHeroData.lv + 1 > 30) or (curTuPoRankUpConfig and curHeroData.lv + 1 > curTuPoRankUpConfig.OpenLevel) then PopupTipPanel.ShowTip("无法升级") return end @@ -534,7 +535,8 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) end --长按升级结束后请求协议 function RoleInfoLayout:LongLvUpClick(oldLv) - if not curTuPoRankUpConfig or curHeroData.lv >= curTuPoRankUpConfig.OpenLevel then + -- 当突破等级为0 最高等级为30级 + if (not curTuPoRankUpConfig and curHeroData.lv > 30) or (curTuPoRankUpConfig and curHeroData.lv > curTuPoRankUpConfig.OpenLevel) then PopupTipPanel.ShowTip("无法升级") return end From 90b577bc168df158a3f65a958debb8516c2de30e Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 12 Jul 2021 16:35:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E3=80=90=E5=BF=83=E9=AD=94=E8=AF=95?= =?UTF-8?q?=E7=82=BC=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index 24271de843..cc97365d87 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -14,6 +14,7 @@ local buyTimes = 0 local storeDataId = 0 local callBack local screenwidth +local isClick = false -- local redTrailType = { -- [1] = RedPointType.PersonTrailHelp, -- [2] = RedPointType.BuddishTrailHelp, @@ -143,7 +144,6 @@ function MonsterCampNewPanel:BindEvent() end --快速战斗 -local isClick = false function this.QuickStartMonsterFightRequest() if isClick then return @@ -168,13 +168,13 @@ function this.QuickStartMonsterFightRequest() isClick = false else + Timer.New(function () + isClick = false + end,1):Start() MonsterCampManager.monsterWave = MonsterCampManager.monsterWave + 1 UIManager.OpenPanel(UIName.BattleWinPopup, nil, false, BATTLE_TYPE.MONSTER_CAMP, result, true, true,function() -- UIManager.OpenPanel(UIName.RewardItemPopup,msg.enventDrop,1,function() this.OnShowPanel()--刷新界面 - Timer.New(function () - isClick = false - end,0.5):Start() -- end) end) end @@ -206,6 +206,7 @@ end --界面打开时调用（用于子类重写） function MonsterCampNewPanel:OnOpen() this.UpView:OnOpen({showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) + isClick = false end --界面打开时调用（用于子类重写） From facb0fdf4a0ebf3aa084a409df7859cc1690d480 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 12 Jul 2021 17:29:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E3=80=90=E8=A7=92=E8=89=B2=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E3=80=91=E5=88=A0=E9=99=A4=E5=8D=87=E7=BA=A7=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index ab089cd163..be057f7b7d 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -475,11 +475,6 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) else if isUpLvMaterials then if isSingleLvUp then--是否是单次升级 - -- 当突破等级为0 最高等级为30级 - if (not curTuPoRankUpConfig and curHeroData.lv + 1 > 30) or (curTuPoRankUpConfig and curHeroData.lv + 1 > curTuPoRankUpConfig.OpenLevel) then - PopupTipPanel.ShowTip("无法升级") - return - end NetManager.HeroLvUpEvent(curHeroData.dynamicId,curHeroData.lv + 1,curHeroData.lv,function (msg) this:DeleteLvUpMaterials(isSingleLvUp,msg) end) @@ -514,7 +509,6 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) else curUpLv = curHeroData.lv + 1 end - -- --LogGreen("isSingleLvUp "..tostring(isSingleLvUp)) NetManager.HeroLvUpEvent(curHeroData.dynamicId,curUpLv,curHeroData.lv,function (msg) this:DeleteLvUpMaterials(isSingleLvUp,msg) end) @@ -535,11 +529,6 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) end --长按升级结束后请求协议 function RoleInfoLayout:LongLvUpClick(oldLv) - -- 当突破等级为0 最高等级为30级 - if (not curTuPoRankUpConfig and curHeroData.lv > 30) or (curTuPoRankUpConfig and curHeroData.lv > curTuPoRankUpConfig.OpenLevel) then - PopupTipPanel.ShowTip("无法升级") - return - end NetManager.HeroLvUpEvent(curHeroData.dynamicId,curHeroData.lv,oldLv,function (msg) this:DeleteLvUpMaterials2(msg) end) From 3d3797345dbd0962cb626567d940064af3137877 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 12 Jul 2021 20:11:15 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E3=80=90=E8=A7=92=E8=89=B2=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E3=80=91=E6=B7=BB=E5=8A=A0=E9=9D=9E=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E5=8D=87=E7=BA=A7=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index be057f7b7d..597edef0f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -433,6 +433,16 @@ end function RoleInfoLayout:OnSortingOrderChange() end + +function RoleInfoLayout:IsCanUpLv(curLv, targetLv) + if isHeroUpTuPo and curLv == upTuPoRankUpConfig.LimitLevel then + return true + end + if (not curTuPoRankUpConfig and targetLv > 30) or (curTuPoRankUpConfig and targetLv > curTuPoRankUpConfig.OpenLevel) then + return false + end + return true +end --升级按钮点击事件处理 function RoleInfoLayout:LvUpClick(isSingleLvUp) --是否为最大等级 @@ -475,6 +485,10 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) else if isUpLvMaterials then if isSingleLvUp then--是否是单次升级 + if not this:IsCanUpLv(curHeroData.lv, curHeroData.lv + 1) then + PopupTipPanel.ShowTip("无法升级") + return + end NetManager.HeroLvUpEvent(curHeroData.dynamicId,curHeroData.lv + 1,curHeroData.lv,function (msg) this:DeleteLvUpMaterials(isSingleLvUp,msg) end) @@ -503,6 +517,11 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) else if isUpLvMaterials then if isSingleLvUp then--是否是单次升级 + -- 判断是否可以升级 + if not this:IsCanUpLv(curHeroData.lv, curHeroData.lv + 1) then + PopupTipPanel.ShowTip("无法升级") + return + end local curUpLv = curHeroData.lv if isHeroUpTuPo and curHeroData.lv == upTuPoRankUpConfig.LimitLevel then curUpLv = curHeroData.lv @@ -529,6 +548,11 @@ function RoleInfoLayout:LvUpClick(isSingleLvUp) end --长按升级结束后请求协议 function RoleInfoLayout:LongLvUpClick(oldLv) + -- 判断是否可以升级 + if not this:IsCanUpLv(oldLv, curHeroData.lv) then + PopupTipPanel.ShowTip("无法升级") + return + end NetManager.HeroLvUpEvent(curHeroData.dynamicId,curHeroData.lv,oldLv,function (msg) this:DeleteLvUpMaterials2(msg) end)