Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
e7698bd4e1
|
|
@ -528,6 +528,7 @@ UpViewRechargeType = {
|
|||
Celebration = 50003,--社稷赏
|
||||
PuTiZi = 1203,--菩提子
|
||||
XianLingCao = 1202,--仙灵草
|
||||
HuaLingFu = 1204,--化灵符
|
||||
QuLingBi = 1205,--驱灵币
|
||||
XinJiangCoin = 1210,--新将来袭代币
|
||||
YHMF= 21,--妖魂魔符
|
||||
|
|
@ -941,12 +942,6 @@ JumpType = {
|
|||
XuanYuanMirror=74 , --车迟斗法
|
||||
CompoundHero = 78,--神将合成、置换
|
||||
Pokemon = 79,--灵兽山
|
||||
TimeLimiteCall = 85,--限时招募
|
||||
QianKunBox = 86,--乾坤宝盒
|
||||
Celebration = 87,--社稷大典
|
||||
YiJingBaoKu = 88,--易经宝库
|
||||
LingShouBaoGe = 89,--灵兽宝阁
|
||||
XiangYaoDuoBao = 90,--降妖夺宝
|
||||
|
||||
|
||||
BuyVigor = 10000, --体力购买
|
||||
|
|
@ -963,6 +958,12 @@ JumpType = {
|
|||
GuildSkill = 10012, --公会技能
|
||||
GuildFete = 10013, --公会祭祀
|
||||
EndlessShop = 10014, --无尽商店
|
||||
TimeLimiteCall = 10015,--限时招募
|
||||
QianKunBox = 10016,--乾坤宝盒
|
||||
Celebration = 10017,--社稷大典
|
||||
YiJingBaoKu = 10018,--易经宝库
|
||||
LingShouBaoGe = 10019,--灵兽宝阁
|
||||
XiangYaoDuoBao = 10020,--降妖夺宝
|
||||
|
||||
}
|
||||
YaoHunFrame = {
|
||||
|
|
|
|||
|
|
@ -641,7 +641,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
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ local _ShowPlusType = {
|
|||
UpViewRechargeType.QuLingBi,
|
||||
UpViewRechargeType.DingKunShenChu,
|
||||
UpViewRechargeType.YeQiuQuan,
|
||||
UpViewRechargeType.HuaLingFu,
|
||||
}
|
||||
|
||||
-- 判断是否显示加号
|
||||
|
|
@ -327,8 +328,10 @@ function UpView:RechargeType(_type)
|
|||
end
|
||||
UIManager.OpenPanel(UIName.MainRechargePanel, 1)
|
||||
end
|
||||
elseif _type == UpViewRechargeType.YeQiuQuan then
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue