修复打包后不能充值得bug
parent
f80ac29435
commit
db1118aa9c
File diff suppressed because it is too large
Load Diff
|
@ -1,8 +0,0 @@
|
||||||
fileFormatVersion: 2
|
|
||||||
guid: 6088b24b13ed31d4cb512d1068724d3f
|
|
||||||
folderAsset: yes
|
|
||||||
DefaultImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
|
@ -118,7 +118,7 @@ function DiffMonsterBuy:DiffMonsterBuy()
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(this.diffMonsterBuyBtn, function()
|
Util.AddOnceClick(this.diffMonsterBuyBtn, function()
|
||||||
if shopItemData.buyTimes <= 0 then
|
if shopItemData.buyTimes <= 0 then
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = rechargeCommodityConfig.Id })
|
PayManager.Pay({ Id = rechargeCommodityConfig.Id })
|
||||||
else
|
else
|
||||||
Log(Language[10527]..rechargeCommodityConfig.Id)
|
Log(Language[10527]..rechargeCommodityConfig.Id)
|
||||||
|
|
|
@ -134,7 +134,7 @@ function this.SingleDataShow(go, data)
|
||||||
PopupTipPanel.ShowTip(Language[10540])
|
PopupTipPanel.ShowTip(Language[10540])
|
||||||
else
|
else
|
||||||
--直购商品
|
--直购商品
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = data.Id })
|
PayManager.Pay({ Id = data.Id })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(data.Id, function(msg)
|
NetManager.RequestBuyGiftGoods(data.Id, function(msg)
|
||||||
|
|
|
@ -97,7 +97,7 @@ function HeroStarFeedPage:FreshRewardShow()
|
||||||
local hasActiveGift = OperatingManager.IsHeroGiftActive()
|
local hasActiveGift = OperatingManager.IsHeroGiftActive()
|
||||||
|
|
||||||
if not hasActiveGift then
|
if not hasActiveGift then
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
UIManager.OpenPanel(UIName.ExpertPanel)
|
UIManager.OpenPanel(UIName.ExpertPanel)
|
||||||
else
|
else
|
||||||
CallBackOnPanelClose(UIName.RewardItemPopup, function()
|
CallBackOnPanelClose(UIName.RewardItemPopup, function()
|
||||||
|
@ -172,7 +172,7 @@ function HeroStarFeedPage:FreshRewardShow()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = info.id })
|
PayManager.Pay({ Id = info.id })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(info.id, function(msg)
|
NetManager.RequestBuyGiftGoods(info.id, function(msg)
|
||||||
|
|
|
@ -27,7 +27,7 @@ end
|
||||||
function WeekCard:BindEvent()
|
function WeekCard:BindEvent()
|
||||||
|
|
||||||
Util.AddClick(self.weekCardBuyBtn, function()
|
Util.AddClick(self.weekCardBuyBtn, function()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = 12 })
|
PayManager.Pay({ Id = 12 })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(12, function()
|
NetManager.RequestBuyGiftGoods(12, function()
|
||||||
|
|
|
@ -88,7 +88,7 @@ function this.SetShow(root,data)
|
||||||
stateBtnText.text=Language[10638]
|
stateBtnText.text=Language[10638]
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(stateBtn,function()
|
Util.AddOnceClick(stateBtn,function()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = data.native.Id })
|
PayManager.Pay({ Id = data.native.Id })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(data.native.Id, function()
|
NetManager.RequestBuyGiftGoods(data.native.Id, function()
|
||||||
|
|
|
@ -77,7 +77,7 @@ function this.OnShowPanelData()
|
||||||
end
|
end
|
||||||
Util.AddOnceClick(this.buyBtn, function()
|
Util.AddOnceClick(this.buyBtn, function()
|
||||||
if shopItemData.buyTimes <= 0 then
|
if shopItemData.buyTimes <= 0 then
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = conFigData.Id })
|
PayManager.Pay({ Id = conFigData.Id })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(conFigData.Id, function()
|
NetManager.RequestBuyGiftGoods(conFigData.Id, function()
|
||||||
|
|
|
@ -90,7 +90,7 @@ function this.OnShowPanelData(i)
|
||||||
|
|
||||||
Util.AddOnceClick(buyBtn, function()
|
Util.AddOnceClick(buyBtn, function()
|
||||||
if shopItemData.buyTimes <= 0 then
|
if shopItemData.buyTimes <= 0 then
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = conFigData.Id })
|
PayManager.Pay({ Id = conFigData.Id })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(conFigData.Id, function()
|
NetManager.RequestBuyGiftGoods(conFigData.Id, function()
|
||||||
|
|
|
@ -178,7 +178,7 @@ function this.SetInfo(id)
|
||||||
Util.AddOnceClick(this.sendBtn,function()
|
Util.AddOnceClick(this.sendBtn,function()
|
||||||
if surplusNum<1 then return end
|
if surplusNum<1 then return end
|
||||||
local recharge=ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,index[id])
|
local recharge=ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,index[id])
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = recharge.Id})
|
PayManager.Pay({ Id = recharge.Id})
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(recharge.Id, function()
|
NetManager.RequestBuyGiftGoods(recharge.Id, function()
|
||||||
|
|
|
@ -348,7 +348,7 @@ function this.OnReceiveLogin(str)
|
||||||
if data.uid and data.token and not LoginManager.IsLogin then
|
if data.uid and data.token and not LoginManager.IsLogin then
|
||||||
AppConst.UserId = data.uid
|
AppConst.UserId = data.uid
|
||||||
AppConst.Token = data.token
|
AppConst.Token = data.token
|
||||||
local openId = AppConst.isSDK and AppConst.OpenId or PlayerPrefs.GetString(openIdkey)
|
local openId = AppConst.isSDKLogin and AppConst.OpenId or PlayerPrefs.GetString(openIdkey)
|
||||||
NetManager.LoginRequest(openId, LoginManager.pt_pId, LoginManager.pt_gId, function()
|
NetManager.LoginRequest(openId, LoginManager.pt_pId, LoginManager.pt_gId, function()
|
||||||
if not LoginManager.IsLogin then
|
if not LoginManager.IsLogin then
|
||||||
LoginManager.IsLogin = true
|
LoginManager.IsLogin = true
|
||||||
|
|
|
@ -487,7 +487,7 @@ function GiftPackPage:RefreshShowData(item, data, type, DataTypeIndex)
|
||||||
self:BuyAction(costId, finalNum, SHOP_TYPE.FINDTREASURE_GIFT, data.id, type)
|
self:BuyAction(costId, finalNum, SHOP_TYPE.FINDTREASURE_GIFT, data.id, type)
|
||||||
else
|
else
|
||||||
--直购商品
|
--直购商品
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = data.goodsId })
|
PayManager.Pay({ Id = data.goodsId })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(data.goodsId, function()
|
NetManager.RequestBuyGiftGoods(data.goodsId, function()
|
||||||
|
|
|
@ -250,7 +250,7 @@ function GrowthGiftPage:OnBtnInvestClicked()
|
||||||
end
|
end
|
||||||
function GrowthGiftPage:RequestBuy()
|
function GrowthGiftPage:RequestBuy()
|
||||||
local giftGoodsInfo = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, curGiftsId)
|
local giftGoodsInfo = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, curGiftsId)
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({Id = giftGoodsInfo.goodsId})
|
PayManager.Pay({Id = giftGoodsInfo.goodsId})
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(giftGoodsInfo.goodsId,function(respond)
|
NetManager.RequestBuyGiftGoods(giftGoodsInfo.goodsId,function(respond)
|
||||||
|
|
|
@ -89,7 +89,7 @@ function UpperMonthCard:BindEvent()
|
||||||
JumpManager.GoJump(36004)
|
JumpManager.GoJump(36004)
|
||||||
end, Language[10719], Language[10023],nil, false)
|
end, Language[10719], Language[10023],nil, false)
|
||||||
else
|
else
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = self.baseType })
|
PayManager.Pay({ Id = self.baseType })
|
||||||
else
|
else
|
||||||
Log(Language[11489] .. self.baseType)
|
Log(Language[11489] .. self.baseType)
|
||||||
|
|
|
@ -153,7 +153,7 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data)
|
||||||
PopupTipPanel.ShowTip(Language[10540])
|
PopupTipPanel.ShowTip(Language[10540])
|
||||||
else
|
else
|
||||||
--直购商品
|
--直购商品
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = data.goodsId })
|
PayManager.Pay({ Id = data.goodsId })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(data.goodsId, function()
|
NetManager.RequestBuyGiftGoods(data.goodsId, function()
|
||||||
|
|
|
@ -512,7 +512,7 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex)
|
||||||
CheckRedPointStatus(RedPointType.GrowthPackage)
|
CheckRedPointStatus(RedPointType.GrowthPackage)
|
||||||
else
|
else
|
||||||
--直购商品
|
--直购商品
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = data.goodsId })
|
PayManager.Pay({ Id = data.goodsId })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(data.goodsId, function()
|
NetManager.RequestBuyGiftGoods(data.goodsId, function()
|
||||||
|
|
|
@ -34,7 +34,7 @@ function HeavenUnlockExtraRewardPanel:BindEvent()
|
||||||
this:ClosePanel()
|
this:ClosePanel()
|
||||||
end)
|
end)
|
||||||
Util.AddOnceClick(this.dealBtn,function()
|
Util.AddOnceClick(this.dealBtn,function()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({Id = 106})
|
PayManager.Pay({Id = 106})
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(106,function()
|
NetManager.RequestBuyGiftGoods(106,function()
|
||||||
|
|
|
@ -66,7 +66,7 @@ function UnlockExtraRewardPanel:OnDealBtnClicked()
|
||||||
-- self:ClosePanel()
|
-- self:ClosePanel()
|
||||||
-- end)
|
-- end)
|
||||||
-- end)
|
-- end)
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = self.goodsId })
|
PayManager.Pay({ Id = self.goodsId })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(self.goodsId, function()
|
NetManager.RequestBuyGiftGoods(self.goodsId, function()
|
||||||
|
|
|
@ -35,7 +35,7 @@ function this:BindEvent()
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Util.AddClick(this.btnBuy,function()
|
Util.AddClick(this.btnBuy,function()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = curGiftId })
|
PayManager.Pay({ Id = curGiftId })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(curGiftId, function()
|
NetManager.RequestBuyGiftGoods(curGiftId, function()
|
||||||
|
|
|
@ -531,7 +531,7 @@ function this:RechargeShopItemAdapter(shopItem, itemData)
|
||||||
|
|
||||||
-- 购买事件
|
-- 购买事件
|
||||||
Util.AddOnceClick(shopItem, function()
|
Util.AddOnceClick(shopItem, function()
|
||||||
if AppConst.isSDK then
|
if AppConst.isSDKLogin then
|
||||||
PayManager.Pay({ Id = itemData.goodsId })
|
PayManager.Pay({ Id = itemData.goodsId })
|
||||||
else
|
else
|
||||||
NetManager.RequestBuyGiftGoods(itemData.goodsId, function()
|
NetManager.RequestBuyGiftGoods(itemData.goodsId, function()
|
||||||
|
|
Loading…
Reference in New Issue