dev_chengFeng
ZhangBiao 2020-07-24 15:22:17 +08:00
parent 0ad52a3855
commit b3ddd8fc96
6 changed files with 45 additions and 67 deletions

View File

@ -462,7 +462,6 @@ MonoBehaviour:
- Assets/ManagedResources/~Lua/Base
- Assets/ManagedResources/~Lua/cjson
- Assets/ManagedResources/~Lua/Common
- Assets/ManagedResources/~Lua/Config/Data
- Assets/ManagedResources/~Lua/Data
- Assets/ManagedResources/~Lua/Extends
- Assets/ManagedResources/~Lua/Framework
@ -5163,14 +5162,6 @@ MonoBehaviour:
extension: .png
resPathIndex: 28
resAbNameIndex: 14
- resName: "\u9996\u5145\u9001\u4E94\u661F\u5B59\u609F\u7A7A1"
extension: .jpg
resPathIndex: 28
resAbNameIndex: 14
- resName: "\u9996\u5145\u9001\u4E94\u661F\u5B59\u609F\u7A7A2"
extension: .jpg
resPathIndex: 28
resAbNameIndex: 14
- resName: r_shouchong_lingqu_01
extension: .png
resPathIndex: 29
@ -28431,10 +28422,6 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 158
resAbNameIndex: 1546
- resName: "\u7ADE\u6280\u573A-3-7-18"
extension: .jpg
resPathIndex: 158
resAbNameIndex: 1546
- resName: ArenaTopMatchPanel
extension: .prefab
resPathIndex: 159
@ -28447,10 +28434,6 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 159
resAbNameIndex: 1547
- resName: "QQ\u56FE\u724720200723144602"
extension: .png
resPathIndex: 159
resAbNameIndex: 1547
- resName: TopMatchPlayBattleAinSelectPopup
extension: .prefab
resPathIndex: 159
@ -28459,14 +28442,6 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 159
resAbNameIndex: 1547
- resName: "\u5DC5\u5CF0\u8D5B-\u6539\u72482"
extension: .jpg
resPathIndex: 159
resAbNameIndex: 1547
- resName: "\u5DC5\u5CF0\u8D5B-\u7ADE\u731C2"
extension: .jpg
resPathIndex: 159
resAbNameIndex: 1547
- resName: BagPanel
extension: .prefab
resPathIndex: 160
@ -29335,14 +29310,6 @@ MonoBehaviour:
extension: .prefab
resPathIndex: 208
resAbNameIndex: 1590
- resName: "\u5B9D\u7269\u5206\u89E31"
extension: .jpg
resPathIndex: 208
resAbNameIndex: 1590
- resName: "\u5B9D\u7269\u5206\u89E32"
extension: .jpg
resPathIndex: 208
resAbNameIndex: 1590
- resName: RewardBoxPanel
extension: .prefab
resPathIndex: 209

View File

@ -2167,7 +2167,15 @@ function this.GetHeroReturnItems(selectHeroData, type)
--1裸角色卡没有突破过的角色卡熔炼后返还的材料=当前等级返还升级材料+item表返还材料
--2有过突破的卡 =当前等级返还升级材料+突破表返还材料+升星返还材料
local ShowItemlist = {}
if v.breakId == 0 and v.upStarId == 0 then
local pId
if v.breakId == 0 then
pId=0
else
pId= heroRankUpConfig[v.breakId].Phase[2]
end
if pId == 0 and v.upStarId == 0 then
local rewardGroupId = tonumber(itemConfig[v.id].ResolveReward)
if rewardGroupId and rewardGroup[rewardGroupId] then
local showItem = rewardGroup[rewardGroupId].ShowItem
@ -2178,23 +2186,27 @@ function this.GetHeroReturnItems(selectHeroData, type)
end
end
else
if v.breakId > 0 then
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",2,"Key",v.breakId)
if pId > 0 then
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",2,"Key",pId)
if heroRankUpConfig then
local sumConsume = heroRankUpConfig.Value
for i = 1, #sumConsume do
table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue})
end
else
LogRed("pId:"..pId.." v.breakId:"..v.breakId.." v.id:"..v.id)
end
end
if v.upStarId > 0 then
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",1,"Key",v.upStarId)
if v.star > 0 then
local heroRankUpConfig = ConfigManager.GetConfigDataByDoubleKey(ConfigName.HeroSacrifice,"Type",1,"Key",v.star)
if heroRankUpConfig then
local sumConsume = heroRankUpConfig.Value
for i = 1, #sumConsume do
table.insert(ShowItemlist, {sumConsume[i][1], sumConsume[i][2] * specificValue})
end
end
else
LogRed("v.star :"..v.star)
end
end
local rewardShowStr2 = {}
@ -2227,6 +2239,7 @@ function this.GetHeroReturnItems2(ShowItemlist, allRewardData)
local curReward = {}
curReward.id = ShowItemlist[i][1]
curReward.num = ShowItemlist[i][2]
LogBlue("curReward.id"..curReward.id.." curReward.num"..curReward.num)
curReward.itemConfig = itemConfig[curReward.id]
if allRewardData[curReward.id] == nil then
allRewardData[curReward.id] = curReward

View File

@ -253,6 +253,7 @@ function OperatingPanel:RefreshTabStatus()
end
--活动暂时关闭,开启时删掉就好了==========================================================================================================================
self.operateTabs[1]:SetActive(false)
self.operateTabs[2]:SetActive(false)
self.operateTabs[9]:SetActive(false)
self.operateTabs[3]:SetActive(false)
self.operateTabs[10]:SetActive(false)

View File

@ -86,10 +86,10 @@ function this.InitRedPointAllRelate()
RPData:SetParent(RedPointType.LuckyCat_GetReward, RedPointType.LuckyCat)
-- 充值
-- RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge)
RPData:SetParent(RedPointType.Shop_Page_Recharge, RedPointType.Recharge)
RPData:SetParent(RedPointType.VIP_SHOP_DETAIL, RedPointType.Shop_Page_Recharge)
-- RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge)
-- RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包
RPData:SetParent(RedPointType.DailyGift, RedPointType.Recharge)
RPData:SetParent(RedPointType.GrowthPackage, RedPointType.Recharge)--成长礼包
-- 主界面商店
RPData:SetParent(RedPointType.Shop_Page_General, RedPointType.Shop)
RPData:SetParent(RedPointType.Shop_Page_Coin, RedPointType.Shop)

View File

@ -9,32 +9,25 @@ local oldAccumRecharge = 0
-- Tab管理器
local TabBox = require("Modules/Common/TabBox")
local _PageInfo = {
--====活动暂时关闭,恢复时删掉最下面的,就行
-- [1] = { -- 充值
-- default = "r_shop_chongzhi_01", lock = "r_shop_chongzhi_01", select = "r_shop_chongzhi_02",
-- rpType = RedPointType.Shop_Page_Recharge,
-- },
-- [2] = { -- 充值
-- default = "l_mrlb_icon2", lock = "l_mrlb_icon2", select = "l_mrlb_icon1",
-- rpType = RedPointType.DailyGift,
-- params = {DirectBuyType.DAILY_GIFT}, -- 每日礼包
-- },
-- [3] = { -- 充值
-- default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1",
-- -- rpType = RedPointType.Shop_Page_Recharge,
-- params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包
-- },
-- [4] = { -- 成长礼包
-- default = "c_czlb_icon2", lock = "c_czlb_icon2", select = "c_czlb_icon1",
-- rpType = RedPointType.GrowthPackage,
-- params = {SHOP_TYPE.VIP_GIFT},-- 成长礼包
-- },
[1] = { -- 充值
default = "r_shop_chongzhi_01", lock = "r_shop_chongzhi_01", select = "r_shop_chongzhi_02",
rpType = RedPointType.Shop_Page_Recharge,
},
[2] = { -- 充值
default = "l_mrlb_icon2", lock = "l_mrlb_icon2", select = "l_mrlb_icon1",
rpType = RedPointType.DailyGift,
params = {DirectBuyType.DAILY_GIFT}, -- 每日礼包
},
[3] = { -- 充值
default = "t_tqsc_icon2", lock = "t_tqsc_icon2", select = "t_tqsc_icon1",
-- rpType = RedPointType.Shop_Page_Recharge,
params = {DirectBuyType.FINDTREASURE_GIFT},-- 特权礼包
},
[4] = { -- 成长礼包
default = "c_czlb_icon2", lock = "c_czlb_icon2", select = "c_czlb_icon1",
rpType = RedPointType.GrowthPackage,
params = {SHOP_TYPE.VIP_GIFT},-- 成长礼包
},
}
local GiftView = require("Modules/Recharge/View/GiftView")
local RechargeView = require("Modules/Recharge/View/RechargeView")
@ -55,11 +48,10 @@ function MainShopPanel:InitComponent()
local giftView = GiftView.new(self, Util.GetGameObject(self.transform, "content/page_1"))
self.PageList = {
-- [1] = RechargeView.new(self, Util.GetGameObject(self.transform, "content/ShopView")),
-- [2] = giftView,
-- [3] = giftView,
-- [4] = giftView,
[1] = giftView,
[1] = RechargeView.new(self, Util.GetGameObject(self.transform, "content/ShopView")),
[2] = giftView,
[3] = giftView,
[4] = giftView,
}
-- 上部货币显示
this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.transform, { showType = UpViewOpenType.ShowLeft})

View File

@ -289,6 +289,11 @@ function UpView:OnClick(index)
--UIManager.OpenPanel(UIName.OperatingPanel,{tabIndex =1,extraParam =2})
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, 20)--元素神符
end
--充值入口暂时关闭
if (reChargeType==16) then
return
end
self:RechargeType(reChargeType)
end