From 4faa39ab2aa4b15e9301b3aff63d90f71bf79d9c Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 24 Dec 2020 15:40:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E9=81=93=E5=85=B7=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=B7=B3=E8=BD=AC=E3=80=91=E4=BD=BF=E7=94=A8=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=B4=BB=E5=8A=A8=E9=81=93?= =?UTF-8?q?=E5=85=B7=E8=A6=81=E5=A4=A7=E4=BA=8E10000?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit b2f8d144706dc35136bd16f0218b09b5f6434ed8) --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 7 +++++++ .../ManagedResources/~Lua/Modules/Player/JumpManager.lua | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c9497d6e57..3b6ad9e8eb 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -929,6 +929,7 @@ JumpType = { CompoundHero = 78,--神将合成、置换 Pokemon = 79,--灵兽山 + BuyVigor = 10000, --体力购买 BuyGold = 10001, --金币购买 Privilege = 10003, -- 特权 @@ -943,6 +944,12 @@ JumpType = { GuildSkill = 10012, --公会技能 GuildFete = 10013, --公会祭祀 EndlessShop = 10014, --无尽商店 + TimeLimiteCall = 10015,--限时招募 + QianKunBox = 10016,--乾坤宝盒 + Celebration = 10017,--社稷大典 + YiJingBaoKu = 10018,--易经宝库 + LingShouBaoGe = 10019,--灵兽宝阁 + XiangYaoDuoBao = 10020,--降妖夺宝 } YaoHunFrame = { diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 68fd8c77e4..35106d17d8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -581,7 +581,7 @@ function this.GoJump(_jumpId) if jumpSData then if jumpSData.Type < 10000 then local serData = ActTimeCtrlManager.GetSerDataByTypeId(jumpSData.Type) - if serData then + if serData then if ActTimeCtrlManager.SingleFuncState(jumpSData.Type) then jumpDic[jumpSData.Type](jumpSData.Skipfactor) else From 28a3341fa116cc4ae5cfb39f137949f7ec454d16 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 24 Dec 2020 15:57:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E3=80=91=E5=8C=96=E7=81=B5=E7=AC=A6=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=9B=B6=E5=94=AE=E7=89=B9=E6=83=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit bc582d93e00898c3a63a0c5fd5c924ed7d89d7c1) --- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + Assets/ManagedResources/~Lua/View/UpView.lua | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3b6ad9e8eb..dbf82f5169 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -525,6 +525,7 @@ UpViewRechargeType = { Celebration = 50003,--社稷赏 PuTiZi = 1203,--菩提子 XianLingCao = 1202,--仙灵草 + HuaLingFu = 1204,--化灵符 QuLingBi = 1205,--驱灵币 YHMF= 21,--妖魂魔符 DingKunShenChu = 1004,-- 定卦神锄 diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index e125065c58..16f15f1e9c 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -50,6 +50,11 @@ local _ShowPlusType = { UpViewRechargeType.YHMF, UpViewRechargeType.QuLingBi, UpViewRechargeType.DingKunShenChu, +<<<<<<< HEAD +======= + UpViewRechargeType.YeQiuQuan, + UpViewRechargeType.HuaLingFu, +>>>>>>> bc582d93e... 【增加跳转】化灵符跳转零售特惠 } -- 判断是否显示加号 @@ -327,6 +332,10 @@ function UpView:RechargeType(_type) end UIManager.OpenPanel(UIName.MainRechargePanel, 1) end + elseif _type == UpViewRechargeType.YeQiuQuan then--跳限时商市 + UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.DynamicAct_TimeLimitShop) + elseif _type == UpViewRechargeType.HuaLingFu then--跳灵兽特惠 + UIManager.OpenPanel(UIName.DynamicActivityPanel,ActivityTypeDef.LingShowTeHui) elseif _type == UpViewRechargeType.GrowthAmulet or _type == UpViewRechargeType.Yaoh or _type == UpViewRechargeType.Panacea or From c5022043fd49aba3671cd54e6198b74587d6be22 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 24 Dec 2020 16:33:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E9=81=93=E5=85=B7=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E8=B7=B3=E8=BD=AC=E3=80=91=E8=B7=B3=E8=BD=AC=E5=90=8E?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 150ec3eb2f3d690f969e629e3a4d61ce5d11faa5) --- .../~Lua/Modules/Player/JumpManager.lua | 5 ++++- .../Modules/Popup/RewardItemSingleShowPopup.lua | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) 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