Merge branch '0功能/1230版本优化内容' of http://60.1.1.230/gaoxin/JL_Client into 0功能/1230版本优化内容
commit
a6a596746d
|
@ -525,6 +525,7 @@ UpViewRechargeType = {
|
|||
Celebration = 50003,--社稷赏
|
||||
PuTiZi = 1203,--菩提子
|
||||
XianLingCao = 1202,--仙灵草
|
||||
HuaLingFu = 1204,--化灵符
|
||||
QuLingBi = 1205,--驱灵币
|
||||
YHMF= 21,--妖魂魔符
|
||||
DingKunShenChu = 1004,-- 定卦神锄
|
||||
|
@ -929,6 +930,7 @@ JumpType = {
|
|||
CompoundHero = 78,--神将合成、置换
|
||||
Pokemon = 79,--灵兽山
|
||||
|
||||
|
||||
BuyVigor = 10000, --体力购买
|
||||
BuyGold = 10001, --金币购买
|
||||
Privilege = 10003, -- 特权
|
||||
|
@ -943,6 +945,12 @@ JumpType = {
|
|||
GuildSkill = 10012, --公会技能
|
||||
GuildFete = 10013, --公会祭祀
|
||||
EndlessShop = 10014, --无尽商店
|
||||
TimeLimiteCall = 10015,--限时招募
|
||||
QianKunBox = 10016,--乾坤宝盒
|
||||
Celebration = 10017,--社稷大典
|
||||
YiJingBaoKu = 10018,--易经宝库
|
||||
LingShouBaoGe = 10019,--灵兽宝阁
|
||||
XiangYaoDuoBao = 10020,--降妖夺宝
|
||||
|
||||
}
|
||||
YaoHunFrame = {
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
@ -131,7 +129,9 @@ function RewardItemSingleShowPopup:BindEvent()
|
|||
end)
|
||||
end
|
||||
elseif itemConfigData then
|
||||
JumpManager.GoJump(itemConfigData.UseJump)
|
||||
JumpManager.GoJump(itemConfigData.UseJump,function ()
|
||||
this:ClosePanel()
|
||||
end)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue