Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
liujiaqi 2020-07-13 16:52:35 +08:00
commit 07f2d763e6
21 changed files with 21 additions and 1229 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 6088b24b13ed31d4cb512d1068724d3f
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -118,7 +118,7 @@ function DiffMonsterBuy:DiffMonsterBuy()
end
Util.AddOnceClick(this.diffMonsterBuyBtn, function()
if shopItemData.buyTimes <= 0 then
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = rechargeCommodityConfig.Id })
else
Log(Language[10527]..rechargeCommodityConfig.Id)

View File

@ -134,7 +134,7 @@ function this.SingleDataShow(go, data)
PopupTipPanel.ShowTip(Language[10540])
else
--直购商品
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = data.Id })
else
NetManager.RequestBuyGiftGoods(data.Id, function(msg)

View File

@ -97,7 +97,7 @@ function HeroStarFeedPage:FreshRewardShow()
local hasActiveGift = OperatingManager.IsHeroGiftActive()
if not hasActiveGift then
if AppConst.isSDK then
if AppConst.isSDKLogin then
UIManager.OpenPanel(UIName.ExpertPanel)
else
CallBackOnPanelClose(UIName.RewardItemPopup, function()
@ -172,7 +172,7 @@ function HeroStarFeedPage:FreshRewardShow()
return
end
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = info.id })
else
NetManager.RequestBuyGiftGoods(info.id, function(msg)

View File

@ -27,7 +27,7 @@ end
function WeekCard:BindEvent()
Util.AddClick(self.weekCardBuyBtn, function()
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = 12 })
else
NetManager.RequestBuyGiftGoods(12, function()

View File

@ -88,7 +88,7 @@ function this.SetShow(root,data)
stateBtnText.text=Language[10638]
end
Util.AddOnceClick(stateBtn,function()
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = data.native.Id })
else
NetManager.RequestBuyGiftGoods(data.native.Id, function()

View File

@ -77,7 +77,7 @@ function this.OnShowPanelData()
end
Util.AddOnceClick(this.buyBtn, function()
if shopItemData.buyTimes <= 0 then
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = conFigData.Id })
else
NetManager.RequestBuyGiftGoods(conFigData.Id, function()

View File

@ -90,7 +90,7 @@ function this.OnShowPanelData(i)
Util.AddOnceClick(buyBtn, function()
if shopItemData.buyTimes <= 0 then
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = conFigData.Id })
else
NetManager.RequestBuyGiftGoods(conFigData.Id, function()

View File

@ -102,7 +102,7 @@ function GuildMemberInfoPopup:BindEvent()
PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.GOODFRIEND))
return
end
if GoodFriendManager.IsInBlackList(this._PlayerId) then
if GoodFriendManager.IsInBlackList(this._MemId) then
PopupTipPanel.ShowTip(Language[10817])
return
end
@ -292,12 +292,11 @@ function this.FormationAdapter(teamInfo)
local frameBtn = Util.GetGameObject(this.Demons[hero.position], "frame")
local heroData = {}
Util.AddOnceClick(frameBtn, function()
NetManager.ViewHeroInfoRequest(this._PlayerId,hero.heroid,function(msg)
NetManager.ViewHeroInfoRequest(this._MemId,hero.heroid,function(msg)
heroData= GoodFriendManager.GetHeroDatas(msg.hero,msg.force,msg.SpecialEffects,msg.guildSkill)
GoodFriendManager.InitEquipData(msg.equip,heroData)--HeroManager.GetSingleHeroData(heroData.dynamicId)
UIManager.OpenPanel(UIName.RoleInfoPopup, heroData,true)
end)
end)
end
end

View File

@ -178,7 +178,7 @@ function this.SetInfo(id)
Util.AddOnceClick(this.sendBtn,function()
if surplusNum<1 then return end
local recharge=ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,index[id])
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = recharge.Id})
else
NetManager.RequestBuyGiftGoods(recharge.Id, function()

View File

@ -348,7 +348,7 @@ function this.OnReceiveLogin(str)
if data.uid and data.token and not LoginManager.IsLogin then
AppConst.UserId = data.uid
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()
if not LoginManager.IsLogin then
LoginManager.IsLogin = true

View File

@ -487,7 +487,7 @@ function GiftPackPage:RefreshShowData(item, data, type, DataTypeIndex)
self:BuyAction(costId, finalNum, SHOP_TYPE.FINDTREASURE_GIFT, data.id, type)
else
--直购商品
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = data.goodsId })
else
NetManager.RequestBuyGiftGoods(data.goodsId, function()

View File

@ -250,7 +250,7 @@ function GrowthGiftPage:OnBtnInvestClicked()
end
function GrowthGiftPage:RequestBuy()
local giftGoodsInfo = OperatingManager.GetGiftGoodsInfo(GoodsTypeDef.GrowthReward, curGiftsId)
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({Id = giftGoodsInfo.goodsId})
else
NetManager.RequestBuyGiftGoods(giftGoodsInfo.goodsId,function(respond)

View File

@ -89,7 +89,7 @@ function UpperMonthCard:BindEvent()
JumpManager.GoJump(36004)
end, Language[10719], Language[10023],nil, false)
else
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = self.baseType })
else
Log(Language[11489] .. self.baseType)

View File

@ -153,7 +153,7 @@ function WeekMonthGiftPackPage:RefreshShowData(item, data)
PopupTipPanel.ShowTip(Language[10540])
else
--直购商品
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = data.goodsId })
else
NetManager.RequestBuyGiftGoods(data.goodsId, function()

View File

@ -512,7 +512,7 @@ function GiftView:RefreshShowData(item, data, buyType, DataTypeIndex)
CheckRedPointStatus(RedPointType.GrowthPackage)
else
--直购商品
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = data.goodsId })
else
NetManager.RequestBuyGiftGoods(data.goodsId, function()

View File

@ -34,7 +34,7 @@ function HeavenUnlockExtraRewardPanel:BindEvent()
this:ClosePanel()
end)
Util.AddOnceClick(this.dealBtn,function()
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({Id = 106})
else
NetManager.RequestBuyGiftGoods(106,function()

View File

@ -66,7 +66,7 @@ function UnlockExtraRewardPanel:OnDealBtnClicked()
-- self:ClosePanel()
-- end)
-- end)
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = self.goodsId })
else
NetManager.RequestBuyGiftGoods(self.goodsId, function()

View File

@ -35,7 +35,7 @@ function this:BindEvent()
end)
Util.AddClick(this.btnBuy,function()
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = curGiftId })
else
NetManager.RequestBuyGiftGoods(curGiftId, function()

View File

@ -531,7 +531,7 @@ function this:RechargeShopItemAdapter(shopItem, itemData)
-- 购买事件
Util.AddOnceClick(shopItem, function()
if AppConst.isSDK then
if AppConst.isSDKLogin then
PayManager.Pay({ Id = itemData.goodsId })
else
NetManager.RequestBuyGiftGoods(itemData.goodsId, function()