From 28a3341fa116cc4ae5cfb39f137949f7ec454d16 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 24 Dec 2020 15:57:51 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E3=80=91=E5=8C=96=E7=81=B5=E7=AC=A6=E8=B7=B3=E8=BD=AC=E9=9B=B6?= =?UTF-8?q?=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