Compare commits

...

3 Commits

6 changed files with 21 additions and 10 deletions

View File

@ -290,11 +290,13 @@ function EnemyView:Update()
-- 判断是否播放满怒动画
if (not self.rageCache or self.rageCache < 1) and rage >= 1 then
local switchEffect = rageEffect
--[[
if GetCurLanguage() == 0 then
switchEffect = switchEffect .. "_vi"
else
switchEffect = switchEffect .. "_en"
end
]]
local go = BattleManager.LoadAsset(switchEffect)
go.transform:SetParent(self.GameObject.transform)
go.transform.localScale = Vector3.one

View File

@ -347,11 +347,13 @@ function PlayerView:Update()
-- 判断是否播放满怒动画
if (not self.rageCache or self.rageCache < 1) and rage >= 1 then
local switchEffect = rageEffect
--[[
if GetCurLanguage() == 0 then
switchEffect = switchEffect .. "_vi"
else
switchEffect = switchEffect .. "_en"
end
]]
local go = BattleManager.LoadAsset(switchEffect)
go.transform:SetParent(self.GameObject.transform)
go.transform.localScale = Vector3.one

View File

@ -276,11 +276,13 @@ function RoleView:Update()
-- 判断是否播放满怒动画
if (not self.rageCache or self.rageCache < 1) and rage >= 1 then
local switchEffect = rageEffect
if GetCurLanguage() == 0 then
--[[
if GetCurLanguage() == 0 then
switchEffect = switchEffect .. "_vi"
else
switchEffect = switchEffect .. "_en"
end
]]
local go = BattleManager.LoadAsset(switchEffect)
go.transform:SetParent(self.GameObject.transform)
go.transform.localScale = Vector3.one

View File

@ -1,6 +1,6 @@
MoneyUtil = {}
local this = MoneyUtil
local specialConfig = ConfigManager.GetConfig(ConfigName.SpecialConfig)
this.RMB2O = {}
this.MT = MoneyType.RMB
@ -9,7 +9,7 @@ this.MT = MoneyType.RMB
function this.Initialize()
--this.MT = tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig, 79).Value)
if GetCurLanguage() == 0 then
this.MT = MoneyType.MM
this.MT = MoneyType.RMB
elseif GetCurLanguage() == 1 then
this.MT = MoneyType.USD
elseif GetCurLanguage() == 2 then
@ -92,16 +92,21 @@ local _t2n = {
[MoneyType.THAI] = "฿%s",
}
function this.GetMoneyUnitName(mt)
LogError("当前充值货币单位名称:"..tostring(mt))
if specialConfig[191] and specialConfig[191].Value == 1 then
return "%s" .. GetLanguageStrById("现金点券")
end
if not mt then
mt = this.MT
end
--[[
----[[
if _t2n[mt] then
return _t2n[mt]
end
return _t2n[MoneyType.USD]
]]
--return _t2n[MoneyType.USD]
--]]
return "%s" .. GetLanguageStrById("现金点券")
end

View File

@ -276,7 +276,7 @@ function LingMaiMiJingPanel:SetTime()
self:OnShow()
self.data.startTime=0
end
end, 1, -1, true)
end, 10, -1, true)
self.timer:Start()
end

View File

@ -139,7 +139,7 @@ function this.Pay(id, func)
UIManager.OpenPanel(UIName.GMCommonConfirmPanel, args)
return
end
if rechargeConfig.OtherBuy1 == nil then
--if rechargeConfig.OtherBuy1 == nil then
if rechargeConfig.BuyType == 1 then --人民币
if AppConst.isSDKLogin and rechargeConfig.Price > 0 then
PayManager.SdkPay({ Id = id, orderId = orderId })
@ -170,7 +170,7 @@ function this.Pay(id, func)
args[4] = sureFunc
args[5] = cancelFunc
UIManager.OpenPanel(UIName.GMCommonConfirmPanel, args)
end
--end
else
MsgPanel.ShowTwo(GetLanguageStrById("现金点券不足是否前往充值"), function()