Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
f4c2bd581c
|
@ -1 +1 @@
|
|||
{"Setting":{"LanguagePackager":{"desc":"\u672C\u5730\u5316\u5904\u7406","versionCode":"26","isActive":"1"},"ServerVersion":{"desc":"\u7528\u4E8E\u5207\u6362\u6B63\u5F0F\u670D\u548C\u63D0\u5BA1\u670D","value":"0","versionCode":"26","isActive":"1"},"ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83B7\u53D6DeviceID\u65B9\u6CD5","versionCode":"24","isActive":"1"},"LayoutBuilderWrap":{"desc":"\u5F3A\u5236\u5237\u65B0layout\u7EC4\u4EF6\u5927\u5C0F\u7684\u65B9\u6CD5\u4FEE\u6539\u5230lua\u4E2D\u8C03\u7528","versionCode":"25","isActive":"1"},"IS_PLAY_VOICE":{"desc":"","versionCode":"1","isActive":"1"},"IS_TITLE_EFFECT_SCALE":{"desc":"","versionCode":"1","isActive":"1"},"IS_PLAY_LOGIN_VIDEO":{"desc":"","versionCode":"1","isActive":"1"},"PACKAGE_CC_CODE":{"desc":"","versionCode":"1","isActive":"1","value":"1001"},"CURVED_TEXT_CODE":{"desc":"\u662F\u5426\u53EF\u4EE5\u663E\u793A\u5F27\u5F62\u6587\u5B57","versionCode":"30","isActive":"1"},"IS_SELECT_RESLUTION":{"desc":"\u662F\u5426\u53EF\u4EE5\u9009\u62E9\u5E27\u7387","versionCode":"30","isActive":"1"}}}
|
||||
{"Setting":{"LanguagePackager":{"desc":"\u672C\u5730\u5316\u5904\u7406","versionCode":"26","isActive":"0"},"ServerVersion":{"desc":"\u7528\u4E8E\u5207\u6362\u6B63\u5F0F\u670D\u548C\u63D0\u5BA1\u670D","value":"0","versionCode":"26","isActive":"1"},"ThinkAnalysis_GetDeviceID":{"desc":"\u6570\u6570\u83B7\u53D6DeviceID\u65B9\u6CD5","versionCode":"24","isActive":"1"},"LayoutBuilderWrap":{"desc":"\u5F3A\u5236\u5237\u65B0layout\u7EC4\u4EF6\u5927\u5C0F\u7684\u65B9\u6CD5\u4FEE\u6539\u5230lua\u4E2D\u8C03\u7528","versionCode":"25","isActive":"1"},"IS_PLAY_VOICE":{"desc":"","versionCode":"1","isActive":"1"},"IS_TITLE_EFFECT_SCALE":{"desc":"","versionCode":"1","isActive":"1"},"IS_PLAY_LOGIN_VIDEO":{"desc":"","versionCode":"1","isActive":"1"},"PACKAGE_CC_CODE":{"desc":"","versionCode":"1","isActive":"1","value":"1001"},"CURVED_TEXT_CODE":{"desc":"\u662F\u5426\u53EF\u4EE5\u663E\u793A\u5F27\u5F62\u6587\u5B57","versionCode":"30","isActive":"1"},"IS_SELECT_RESLUTION":{"desc":"\u662F\u5426\u53EF\u4EE5\u9009\u62E9\u5E27\u7387","versionCode":"30","isActive":"1"}}}
|
|
@ -36,6 +36,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.WorkShop] = function()--锻造
|
||||
|
@ -83,6 +84,7 @@ local jumpDic = {
|
|||
FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ARENA_DEFEND,newFormation,formation.teamPokemonInfos)
|
||||
-- UIManager.OpenPanel(UIName.FormationPanel, FORMATION_TYPE.ARENA_DEFEND)
|
||||
-- PopupTipPanel.ShowTip("请先设置防守阵容")
|
||||
--this.isOpen = false
|
||||
-- return
|
||||
end
|
||||
local openPanle = UIManager.OpenPanel(UIName.ArenaMainPanel)
|
||||
|
@ -95,9 +97,11 @@ local jumpDic = {
|
|||
end,
|
||||
[JumpType.HanYuan] = function()--汉元之境
|
||||
PopupTipPanel.ShowTip(Language[11394])
|
||||
this.isOpen = false
|
||||
end,
|
||||
[JumpType.WangHun] = function()--亡魂之海
|
||||
PopupTipPanel.ShowTip(Language[11394])
|
||||
this.isOpen = false
|
||||
end,
|
||||
|
||||
--暂不开放
|
||||
|
@ -114,6 +118,7 @@ local jumpDic = {
|
|||
end,
|
||||
[JumpType.WorldBoss] = function()--世界boss
|
||||
PopupTipPanel.ShowTip(Language[11394])
|
||||
this.isOpen = false
|
||||
end,
|
||||
[JumpType.Talking] = function()--聊天
|
||||
UIManager.OpenPanel(UIName.ChatPanel)
|
||||
|
@ -157,6 +162,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(JumpType.CommonChallenge))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.HeroChallenge] = function(data)--精英副本
|
||||
|
@ -183,6 +189,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(JumpType.HeroChallenge))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.ChapterReward] = function(data)--章节奖励
|
||||
|
@ -199,6 +206,7 @@ local jumpDic = {
|
|||
local isActive, tips = ShopManager.IsActive(data[1])
|
||||
if not isActive then
|
||||
PopupTipPanel.ShowTip(tips or Language[10574])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,data[1])
|
||||
|
@ -256,6 +264,7 @@ local jumpDic = {
|
|||
end,
|
||||
[JumpType.RechargeStore] = function(data)--充值商店
|
||||
--PopupTipPanel.ShowTip("商店未开启")
|
||||
--this.isOpen = false
|
||||
-- UIManager.OpenPanel(UIName.MainShopPanel,data[1])
|
||||
JumpManager.GoJump(36008)
|
||||
end,
|
||||
|
@ -300,6 +309,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.PrayMainPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip(Language[11396])
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.recharge] = function(data)--充值
|
||||
|
@ -323,9 +333,11 @@ local jumpDic = {
|
|||
-- end
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip(Language[11396])
|
||||
--this.isOpen = false
|
||||
-- end
|
||||
-- else
|
||||
-- PopupTipPanel.ShowTip(Language[11396])
|
||||
--this.isOpen = false
|
||||
-- end
|
||||
-- else
|
||||
-- this.JumpActivity(JumpType.Expert,data[1])
|
||||
|
@ -381,6 +393,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.FormationSetPanel,data[1])
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FormationManager.AllFormationFunIds[data[1]]))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.QuickPurchase] = function(data)--快捷购买
|
||||
|
@ -422,6 +435,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.ExpeditionMainPanel,true)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.GuildAid] = function(data)--公会援助
|
||||
|
@ -440,6 +454,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
|
||||
end,
|
||||
|
@ -461,6 +476,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
|
||||
end,
|
||||
|
@ -478,6 +494,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.Compound] = function(data)--锻造炉
|
||||
|
@ -489,6 +506,7 @@ local jumpDic = {
|
|||
local num = string.split(string.split(string,"|")[1],"#")[2]
|
||||
if PlayerManager.level < tonumber(num) then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10770],num))
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
end
|
||||
|
@ -496,6 +514,7 @@ local jumpDic = {
|
|||
local string = ConfigData[89].Value
|
||||
if PlayerManager.level < tonumber(string) then
|
||||
PopupTipPanel.ShowTip(string.format(Language[10770],string))
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
end
|
||||
|
@ -533,9 +552,11 @@ local jumpDic = {
|
|||
else
|
||||
if DeathPosManager.status==DeathPosStatus.Death then
|
||||
PopupTipPanel.ShowTip(Language[10909])
|
||||
this.isOpen = false
|
||||
return
|
||||
elseif DeathPosManager.status==DeathPosStatus.Close then
|
||||
PopupTipPanel.ShowTip(Language[10910])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
if UIManager.IsOpen(UIName.GuildMainCityPanel) then
|
||||
|
@ -547,6 +568,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.GuildCarDelay] = function()--车迟斗法
|
||||
|
@ -558,6 +580,7 @@ local jumpDic = {
|
|||
end
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GUILD))
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
[JumpType.CompoundHero] = function(data)--神将合成、置换
|
||||
|
@ -572,6 +595,7 @@ local jumpDic = {
|
|||
local isActive, tips = ShopManager.IsActive(13)
|
||||
if not isActive then
|
||||
PopupTipPanel.ShowTip(tips or Language[10574])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,13)
|
||||
|
@ -580,6 +604,7 @@ local jumpDic = {
|
|||
local isActive, tips = ShopManager.IsActive(13)
|
||||
if not isActive then
|
||||
PopupTipPanel.ShowTip(tips or Language[10574])
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
UIManager.OpenPanel(UIName.MainShopPanel,13)
|
||||
|
@ -630,6 +655,7 @@ local jumpDic = {
|
|||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[2])
|
||||
else
|
||||
PopupTipPanel.ShowTip("活动尚未开启")
|
||||
this.isOpen = false
|
||||
end
|
||||
else
|
||||
this.JumpActivity(JumpType.ZhuTiHuoDong,data[1])
|
||||
|
@ -682,6 +708,7 @@ local jumpDic = {
|
|||
UIManager.OpenPanel(UIName.SurpriseBoxPanel)
|
||||
else
|
||||
PopupTipPanel.ShowTip("活动尚未开启")
|
||||
this.isOpen = false
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
@ -690,6 +717,7 @@ function this.JumpActivity(data,skipfactor)
|
|||
local isOpen = DynamicActivityManager.IsActivityOpenByJumpIndex(data, skipfactor)
|
||||
if not isOpen then
|
||||
PopupTipPanel.ShowTip("活动尚未开启")
|
||||
this.isOpen = false
|
||||
return
|
||||
end
|
||||
if DynamicActivityManager.curActivityType == data then
|
||||
|
@ -719,6 +747,7 @@ function this.CheckJump(_jumpId)
|
|||
local b = jumpSData and ActTimeCtrlManager.SingleFuncState(jumpSData.Type)
|
||||
if not b then
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(jumpSData.Type))
|
||||
this.isOpen = false
|
||||
end
|
||||
return b
|
||||
else
|
||||
|
@ -734,6 +763,7 @@ function this.GoJumpWithoutTip(_jumpId)
|
|||
end
|
||||
|
||||
function this.GoJump(_jumpId,fun)
|
||||
this.isOpen = true
|
||||
this.jumpId = _jumpId
|
||||
local jumpSData = JumpConfig[_jumpId]
|
||||
if jumpSData then
|
||||
|
@ -744,6 +774,7 @@ function this.GoJump(_jumpId,fun)
|
|||
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
||||
else
|
||||
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(jumpSData.Type))
|
||||
this.isOpen = false
|
||||
end
|
||||
else
|
||||
jumpDic[jumpSData.Type](jumpSData.Skipfactor)
|
||||
|
@ -753,7 +784,7 @@ function this.GoJump(_jumpId,fun)
|
|||
end
|
||||
end
|
||||
if fun then
|
||||
fun()
|
||||
fun(this.isOpen)
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
RewardItemSingleShowPopup = Inherit(BasePanel)
|
||||
local this = RewardItemSingleShowPopup
|
||||
local JumpConfig = ConfigManager.GetConfig(ConfigName.JumpConfig)
|
||||
local RechargeCommodityConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
|
||||
local itemSid
|
||||
local heroBackData
|
||||
local itemConfigData
|
||||
|
@ -327,7 +328,7 @@ function RewardItemSingleShowPopup:OnShow()
|
|||
SetTextVerTial(this.posText.gameObject,Vector3.New(64,21,0),"MiddleLeft")
|
||||
local jumpDataList = heroConfig.Jump
|
||||
for i = 1, #jumpDataList do
|
||||
if not RECHARGEABLE and (JumpConfig[jumpDataList[i]].Type == JumpType.firstRecharge or JumpConfig[jumpDataList[i]].Type == JumpType.ZhiZunJiangShi) then--(是否开启充值)
|
||||
if not RECHARGEABLE and (JumpConfig[jumpDataList[i]].Type == JumpType.firstRecharge or JumpConfig[jumpDataList[i]].Type == JumpType.ZhiZunJiangShi or JumpConfig[jumpDataList[i]].Type == JumpType.recharge) then--(是否开启充值)
|
||||
else
|
||||
local isShow = true
|
||||
if JumpConfig[jumpDataList[i]].Type == JumpType.firstRecharge then
|
||||
|
@ -362,6 +363,28 @@ function RewardItemSingleShowPopup:OnShow()
|
|||
isShow = false
|
||||
end
|
||||
end
|
||||
elseif JumpConfig[jumpDataList[i]].Type == JumpType.recharge then
|
||||
local actConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityGroups,"PageType",JumpType.recharge,"Sort",JumpConfig[jumpDataList[i]].Skipfactor[1])
|
||||
local list = OperatingManager.GetGiftGoodsInfoList(actConfig.ShopData[1][2])
|
||||
local goodIdList = {}
|
||||
for i = 1,#list do
|
||||
local rechargeConfig = RechargeCommodityConfig[list[i].goodsId]
|
||||
if rechargeConfig.Limit == 0 or rechargeConfig.Limit - list[i].buyTimes > 0 then
|
||||
if rechargeConfig.ShowType == actConfig.ShopData[1][3] then
|
||||
for j = 1,#rechargeConfig.RewardShow do
|
||||
if rechargeConfig.RewardShow[j][1] == heroConfig.Id or rechargeConfig.RewardShow[j][1] == heroConfig.PiecesId then
|
||||
table.insert(goodIdList,rechargeConfig.Id)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
if #goodIdList < 1 then
|
||||
isShow = false
|
||||
else
|
||||
isShow = true
|
||||
end
|
||||
end
|
||||
if isShow then
|
||||
local tempView = SubUIManager.Open(SubUIConfig.JumpViewNew, this.equipProGrid.transform, jumpDataList[i],heroConfig,self)
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
local JumpConfig=ConfigManager.GetConfig(ConfigName.JumpConfig)
|
||||
local ItemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||
local RechargeCommodityConfig=ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig)
|
||||
JumpViewNew = {}
|
||||
function JumpViewNew:New(gameObject)
|
||||
local b = {}
|
||||
|
@ -44,6 +45,7 @@ end
|
|||
function JumpViewNew:OnOpen(jumpId,heroConfig,parent)
|
||||
self.parent = parent
|
||||
self.jumpSData=JumpConfig[jumpId]
|
||||
self.heroId = heroConfig.Id
|
||||
self.needChipId = heroConfig.PiecesId
|
||||
self.needChipNum = ItemConfig[self.needChipId].UsePerCount
|
||||
self.btnSureIma.sprite = self.parent.spLoader:LoadSprite("r_hero_button_002")
|
||||
|
@ -144,7 +146,10 @@ function JumpViewNew:OnOpen(jumpId,heroConfig,parent)
|
|||
self.btnSureIma.sprite = self.parent.spLoader:LoadSprite("r_hero_button_001")
|
||||
end
|
||||
self.desc.text = string.format("<color=#%s>%s:%s/%s</color>",color,ItemConfig[self.needChipId].Name,itemcount,self.needChipNum)
|
||||
elseif self.jumpSData.Type == 40 then
|
||||
elseif self.jumpSData.Type == JumpType.recharge then
|
||||
self.costIconPos.gameObject:SetActive(false)
|
||||
self.desc.text = "快速提升孙悟空星级"
|
||||
elseif self.jumpSData.Type == 40 then
|
||||
self.costIconPos.gameObject:SetActive(false)
|
||||
self.desc.text = "助力玉帝升星"
|
||||
end
|
||||
|
@ -193,9 +198,29 @@ function JumpViewNew:GoToJumpData()
|
|||
ShopManager.SetSelectIndex(self.jumpSData.Skipfactor[1],{self.ShopId})
|
||||
elseif self.jumpSData.Type == JumpType.XingChenShangDian then
|
||||
ShopManager.SetSelectIndex(self.shopType,{self.ShopId})
|
||||
elseif self.jumpSData.Type == JumpType.recharge then
|
||||
local actConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.ActivityGroups,"PageType",JumpType.recharge,"Sort",self.jumpSData.Skipfactor[1])
|
||||
local list = OperatingManager.GetGiftGoodsInfoList(actConfig.ShopData[1][2])
|
||||
local goodIdList = {}
|
||||
for i = 1,#list do
|
||||
local rechargeConfig = RechargeCommodityConfig[list[i].goodsId]
|
||||
if rechargeConfig.Limit == 0 or rechargeConfig.Limit - list[i].buyTimes > 0 then
|
||||
if rechargeConfig.ShowType == actConfig.ShopData[1][3] then
|
||||
for j = 1,#rechargeConfig.RewardShow do
|
||||
if rechargeConfig.RewardShow[j][1] == self.heroId or rechargeConfig.RewardShow[j][1] == self.needChipId then
|
||||
table.insert(goodIdList,rechargeConfig.Id)
|
||||
break
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
DynamicActivityManager.SetSelectIndex(DataType.Direct,goodIdList)
|
||||
end
|
||||
JumpManager.GoJump(self.jumpSData.Id,function()
|
||||
self.parent:ClosePanel()
|
||||
JumpManager.GoJump(self.jumpSData.Id,function(isOpen)
|
||||
if isOpen then
|
||||
self.parent:ClosePanel()
|
||||
end
|
||||
end)
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue