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,--社稷赏
|
Celebration = 50003,--社稷赏
|
||||||
PuTiZi = 1203,--菩提子
|
PuTiZi = 1203,--菩提子
|
||||||
XianLingCao = 1202,--仙灵草
|
XianLingCao = 1202,--仙灵草
|
||||||
|
HuaLingFu = 1204,--化灵符
|
||||||
QuLingBi = 1205,--驱灵币
|
QuLingBi = 1205,--驱灵币
|
||||||
YHMF= 21,--妖魂魔符
|
YHMF= 21,--妖魂魔符
|
||||||
DingKunShenChu = 1004,-- 定卦神锄
|
DingKunShenChu = 1004,-- 定卦神锄
|
||||||
|
@ -929,6 +930,7 @@ JumpType = {
|
||||||
CompoundHero = 78,--神将合成、置换
|
CompoundHero = 78,--神将合成、置换
|
||||||
Pokemon = 79,--灵兽山
|
Pokemon = 79,--灵兽山
|
||||||
|
|
||||||
|
|
||||||
BuyVigor = 10000, --体力购买
|
BuyVigor = 10000, --体力购买
|
||||||
BuyGold = 10001, --金币购买
|
BuyGold = 10001, --金币购买
|
||||||
Privilege = 10003, -- 特权
|
Privilege = 10003, -- 特权
|
||||||
|
@ -943,6 +945,12 @@ JumpType = {
|
||||||
GuildSkill = 10012, --公会技能
|
GuildSkill = 10012, --公会技能
|
||||||
GuildFete = 10013, --公会祭祀
|
GuildFete = 10013, --公会祭祀
|
||||||
EndlessShop = 10014, --无尽商店
|
EndlessShop = 10014, --无尽商店
|
||||||
|
TimeLimiteCall = 10015,--限时招募
|
||||||
|
QianKunBox = 10016,--乾坤宝盒
|
||||||
|
Celebration = 10017,--社稷大典
|
||||||
|
YiJingBaoKu = 10018,--易经宝库
|
||||||
|
LingShouBaoGe = 10019,--灵兽宝阁
|
||||||
|
XiangYaoDuoBao = 10020,--降妖夺宝
|
||||||
|
|
||||||
}
|
}
|
||||||
YaoHunFrame = {
|
YaoHunFrame = {
|
||||||
|
|
|
@ -576,12 +576,12 @@ function this.GoJumpWithoutTip(_jumpId)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.GoJump(_jumpId)
|
function this.GoJump(_jumpId,fun)
|
||||||
local jumpSData = JumpConfig[_jumpId]
|
local jumpSData = JumpConfig[_jumpId]
|
||||||
if jumpSData then
|
if jumpSData then
|
||||||
if jumpSData.Type < 10000 then
|
if jumpSData.Type < 10000 then
|
||||||
local serData = ActTimeCtrlManager.GetSerDataByTypeId(jumpSData.Type)
|
local serData = ActTimeCtrlManager.GetSerDataByTypeId(jumpSData.Type)
|
||||||
if serData then
|
if serData then
|
||||||
if ActTimeCtrlManager.SingleFuncState(jumpSData.Type) then
|
if ActTimeCtrlManager.SingleFuncState(jumpSData.Type) then
|
||||||
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
||||||
else
|
else
|
||||||
|
@ -594,6 +594,9 @@ function this.GoJump(_jumpId)
|
||||||
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
if fun then
|
||||||
|
fun()
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.ShowGuide(panelId, targetGO)
|
function this.ShowGuide(panelId, targetGO)
|
||||||
|
|
|
@ -62,9 +62,7 @@ function RewardItemSingleShowPopup:BindEvent()
|
||||||
NetManager.HeroComposeRequest(item,function (drop)
|
NetManager.HeroComposeRequest(item,function (drop)
|
||||||
this.SendBackCompoundReCallBack(drop)
|
this.SendBackCompoundReCallBack(drop)
|
||||||
end)
|
end)
|
||||||
if compoundNum>0 then
|
if compoundNum<=0 then
|
||||||
|
|
||||||
else
|
|
||||||
PopupTipPanel.ShowTip(Language[10200])
|
PopupTipPanel.ShowTip(Language[10200])
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
|
@ -93,7 +91,7 @@ function RewardItemSingleShowPopup:BindEvent()
|
||||||
UIManager.OpenPanel(UIName.CreateNamePopup)
|
UIManager.OpenPanel(UIName.CreateNamePopup)
|
||||||
elseif itemConfigData.ItemType == ItemType.Skin then
|
elseif itemConfigData.ItemType == ItemType.Skin then
|
||||||
local group = ConfigManager.GetConfigData(ConfigName.RewardGroup,tonumber(itemConfig[itemSid].ResolveReward)).ShowItem
|
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()
|
end, function()
|
||||||
local curResolveAllItemList = {}
|
local curResolveAllItemList = {}
|
||||||
table.insert(curResolveAllItemList,{itemId = itemSid,itemNum = 1})
|
table.insert(curResolveAllItemList,{itemId = itemSid,itemNum = 1})
|
||||||
|
@ -114,7 +112,7 @@ function RewardItemSingleShowPopup:BindEvent()
|
||||||
local skinConfig = ConfigManager.GetConfigData(ConfigName.HeroSkin,itemSid)
|
local skinConfig = ConfigManager.GetConfigData(ConfigName.HeroSkin,itemSid)
|
||||||
if HeroSkinManager.IsExist(skinConfig.Type) then
|
if HeroSkinManager.IsExist(skinConfig.Type) then
|
||||||
PopupTipPanel.ShowTip("已解锁该皮肤,请在皮肤有效期之后再解锁")
|
PopupTipPanel.ShowTip("已解锁该皮肤,请在皮肤有效期之后再解锁")
|
||||||
else
|
else
|
||||||
local curResolveAllItemList = {}
|
local curResolveAllItemList = {}
|
||||||
table.insert(curResolveAllItemList,{itemId = itemSid,itemNum = 1})
|
table.insert(curResolveAllItemList,{itemId = itemSid,itemNum = 1})
|
||||||
NetManager.UseAndPriceItemRequest(0,curResolveAllItemList,function (drop)
|
NetManager.UseAndPriceItemRequest(0,curResolveAllItemList,function (drop)
|
||||||
|
@ -124,14 +122,16 @@ function RewardItemSingleShowPopup:BindEvent()
|
||||||
local herodata = HeroManager.GetHeroDataByHeroSIdAndMinSortIdAndSkinId(skinConfig.HeroId,skinConfig.Type)
|
local herodata = HeroManager.GetHeroDataByHeroSIdAndMinSortIdAndSkinId(skinConfig.HeroId,skinConfig.Type)
|
||||||
LogGreen("herodata.dynamicId:"..tostring(herodata.dynamicId))
|
LogGreen("herodata.dynamicId:"..tostring(herodata.dynamicId))
|
||||||
UIManager.OpenPanel(UIName.RoleInfoPanel,herodata, HeroManager.GetAllHeroDatas(),true,5)
|
UIManager.OpenPanel(UIName.RoleInfoPanel,herodata, HeroManager.GetAllHeroDatas(),true,5)
|
||||||
end,"取消","确定","",false,"")
|
end,"取消","确定","",false,"")
|
||||||
else
|
else
|
||||||
PopupTipPanel.ShowTip(string.format("成功解锁皮肤%s",skinConfig.ReadingName))
|
PopupTipPanel.ShowTip(string.format("成功解锁皮肤%s",skinConfig.ReadingName))
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
elseif itemConfigData then
|
elseif itemConfigData then
|
||||||
JumpManager.GoJump(itemConfigData.UseJump)
|
JumpManager.GoJump(itemConfigData.UseJump,function ()
|
||||||
|
this:ClosePanel()
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -50,6 +50,11 @@ local _ShowPlusType = {
|
||||||
UpViewRechargeType.YHMF,
|
UpViewRechargeType.YHMF,
|
||||||
UpViewRechargeType.QuLingBi,
|
UpViewRechargeType.QuLingBi,
|
||||||
UpViewRechargeType.DingKunShenChu,
|
UpViewRechargeType.DingKunShenChu,
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
UpViewRechargeType.YeQiuQuan,
|
||||||
|
UpViewRechargeType.HuaLingFu,
|
||||||
|
>>>>>>> bc582d93e... 【增加跳转】化灵符跳转零售特惠
|
||||||
}
|
}
|
||||||
|
|
||||||
-- 判断是否显示加号
|
-- 判断是否显示加号
|
||||||
|
@ -327,6 +332,10 @@ function UpView:RechargeType(_type)
|
||||||
end
|
end
|
||||||
UIManager.OpenPanel(UIName.MainRechargePanel, 1)
|
UIManager.OpenPanel(UIName.MainRechargePanel, 1)
|
||||||
end
|
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
|
elseif _type == UpViewRechargeType.GrowthAmulet or
|
||||||
_type == UpViewRechargeType.Yaoh or
|
_type == UpViewRechargeType.Yaoh or
|
||||||
_type == UpViewRechargeType.Panacea or
|
_type == UpViewRechargeType.Panacea or
|
||||||
|
|
Loading…
Reference in New Issue