Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
ab01f4ab25
|
|
@ -759,6 +759,7 @@ function this.CreatSingleData(shopData,DataTypeIndex,buyType,actType)
|
|||
end
|
||||
else
|
||||
data.price = string.format(MoneyUtil.GetMoneyUnitName(), data.finalNum)
|
||||
data.buyInfo = Language[10580]..data.limitNum - data.boughtNum..Language[10048]
|
||||
end
|
||||
data.endTime = shopData.endTime
|
||||
else
|
||||
|
|
|
|||
|
|
@ -668,11 +668,11 @@ function this.GetCurLevelTips()
|
|||
LogError(id)
|
||||
if config.Type == 1 then
|
||||
if this.CarbonIdCompare(this.GetCurFightId(), config.Parameter) < 0 then
|
||||
return config.Desc
|
||||
return string.format("通关%s,%s", mainLevelConfig[config.Parameter].Name, config.Desc)
|
||||
end
|
||||
elseif config.Type == 2 then
|
||||
if PlayerManager.level < config.Parameter then
|
||||
return config.Desc
|
||||
return string.format("等级达%s,%s", config.Parameter, config.Desc)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue