天宫商店数量显示调整,去除log
parent
9b138fe566
commit
4e49e4582a
|
@ -191,6 +191,19 @@ function PrintWanNum3(num)
|
||||||
return tostring(num)
|
return tostring(num)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
function PrintWanNum4(num)
|
||||||
|
if num >= 100000000 then
|
||||||
|
return string.format("%.1f", num / 100000000) .. Language[12100]
|
||||||
|
elseif num >= 10000 then
|
||||||
|
if num % 10000 == 0 then
|
||||||
|
return tostring(math.floor(num / 10000)) .. Language[10042]
|
||||||
|
else
|
||||||
|
return string.format("%.1f",num / 10000) .. Language[10042]
|
||||||
|
end
|
||||||
|
else
|
||||||
|
return tostring(num)
|
||||||
|
end
|
||||||
|
end
|
||||||
--判断两个时间在同一天
|
--判断两个时间在同一天
|
||||||
function Util_Check_insameday(time1, time2)
|
function Util_Check_insameday(time1, time2)
|
||||||
local date1 = os.date("*t", time1)
|
local date1 = os.date("*t", time1)
|
||||||
|
@ -1010,6 +1023,7 @@ function TimeToDHMS(second)
|
||||||
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
|
||||||
return string.format(Language[10548],day, hour, minute, sec)
|
return string.format(Language[10548],day, hour, minute, sec)
|
||||||
end
|
end
|
||||||
|
|
||||||
--- 将一段时间转换为时分秒
|
--- 将一段时间转换为时分秒
|
||||||
function TimeToHMS(t)
|
function TimeToHMS(t)
|
||||||
if not t or t < 0 then
|
if not t or t < 0 then
|
||||||
|
|
|
@ -187,14 +187,14 @@ function TimeLimitedCall:RefreshNextLevelReward()
|
||||||
end
|
end
|
||||||
|
|
||||||
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(curActivityId)
|
local reMaintimes = ActivityGiftManager.GetActivityValueInfo(curActivityId)
|
||||||
LogBlue(ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count)
|
--LogBlue(ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count)
|
||||||
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count - reMaintimes
|
reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count - reMaintimes
|
||||||
LogBlue("reMaintimes:"..reMaintimes)
|
--LogBlue("reMaintimes:"..reMaintimes)
|
||||||
self.recruitTimesUpdate.text = string.format("召唤<color=#F27D0F>%s</color>次必得UP神将",reMaintimes)
|
self.recruitTimesUpdate.text = string.format("召唤<color=#F27D0F>%s</color>次必得UP神将",reMaintimes)
|
||||||
|
|
||||||
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
|
||||||
LogBlue(info.endTime)
|
--LogBlue(info.endTime)
|
||||||
LogBlue(info.startTime)
|
--LogBlue(info.startTime)
|
||||||
info = info.endTime - info.startTime
|
info = info.endTime - info.startTime
|
||||||
info = self:TimeToDHMS(info)
|
info = self:TimeToDHMS(info)
|
||||||
self.recruitTimeUpdate.text = string.format("活动剩余时间:"..info)
|
self.recruitTimeUpdate.text = string.format("活动剩余时间:"..info)
|
||||||
|
@ -213,9 +213,9 @@ function TimeLimitedCall:TimeToDHMS(second)
|
||||||
end
|
end
|
||||||
|
|
||||||
function TimeLimitedCall:GetMissionStateById(num,activityId)
|
function TimeLimitedCall:GetMissionStateById(num,activityId)
|
||||||
LogBlue("activityId:"..activityId.. ",num:"..num)
|
--LogBlue("activityId:"..activityId.. ",num:"..num)
|
||||||
local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
|
local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
|
||||||
LogBlue(mission.progress.." "..mission.state)
|
--LogBlue(mission.progress.." "..mission.state)
|
||||||
return mission.progress,mission.state
|
return mission.progress,mission.state
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -441,7 +441,7 @@ function this:ShopItemAdapter(shopItem, itemData)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
-- 消耗物品的信息
|
-- 消耗物品的信息
|
||||||
itemPrice.text = PrintWanNum2(tonumber(price))--tostring(price)
|
itemPrice.text = PrintWanNum4(tonumber(price))--tostring(price)
|
||||||
costIcon.sprite = SetIcon(costId)
|
costIcon.sprite = SetIcon(costId)
|
||||||
|
|
||||||
-- 判断商品栏位是否解锁
|
-- 判断商品栏位是否解锁
|
||||||
|
|
Loading…
Reference in New Issue