Branch_DNA
parent
ebc3409582
commit
3f21aae331
|
|
@ -139,6 +139,7 @@ function PoolManager:LoadAsset(resName, assetType)
|
|||
table.remove(tempTable.resList,#tempTable.resList)
|
||||
end
|
||||
else
|
||||
LogError("===="..resName)
|
||||
local _obj = resMgr:LoadAsset(resName)
|
||||
if _obj == nil then
|
||||
|
||||
|
|
|
|||
|
|
@ -757,6 +757,7 @@ function UIManager.MultiLanguageCheck(gameObject)
|
|||
local imgStr = imageArr[i].sprite.name
|
||||
if string.sub(imgStr, -3) == "_zh" then
|
||||
validCntImg = validCntImg + 1
|
||||
LogError("===="..imgStr)
|
||||
imageArr[i].sprite = Util.LoadSprite(imgStr)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
|
|
@ -261,7 +261,7 @@ function this.RequestPay(context)
|
|||
PopupTipPanel.ShowTip(GetLanguageStrById(errorCfg.Desc))
|
||||
else
|
||||
local params = SDK.SDKPayArgs.New()
|
||||
params.rechargeId = context.RechargeId
|
||||
params.rechargeId = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, context.Id).RechargeId2
|
||||
params.showType = context.ShowType
|
||||
params.productId = context.Id
|
||||
params.productName = GetLanguageStrById(context.Name) or ""
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -154,14 +154,14 @@ function SettingInfo:BindEvent()
|
|||
end)
|
||||
--切换账号
|
||||
Util.AddClick(this.btnChangeLogin, function()
|
||||
MsgPanel.ShowTwo(GetLanguageStrById(11895), nil, function()
|
||||
--MsgPanel.ShowTwo(GetLanguageStrById(11895), nil, function()
|
||||
if AppConst.isSDKLogin then
|
||||
SDKMgr:Logout()
|
||||
else
|
||||
Framework.Dispose()
|
||||
App.Instance:ReStart()
|
||||
end
|
||||
end)
|
||||
--end)
|
||||
end)
|
||||
-- Util.AddClick(this.btnOneKeyCopy, function()
|
||||
-- if not UnityEngine.Application.isMobilePlatform then
|
||||
|
|
|
|||
Loading…
Reference in New Issue