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

dev_chengFeng
2han9B1a0 2020-07-08 17:03:44 +08:00
commit 5e00986d05
10 changed files with 7 additions and 21 deletions

View File

@ -191,19 +191,6 @@ function PrintWanNum3(num)
return tostring(num)
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)
local date1 = os.date("*t", time1)
@ -1023,7 +1010,6 @@ function TimeToDHMS(second)
local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600)
return string.format(Language[10548],day, hour, minute, sec)
end
--- 将一段时间转换为时分秒
function TimeToHMS(t)
if not t or t < 0 then

View File

@ -187,14 +187,14 @@ function TimeLimitedCall:RefreshNextLevelReward()
end
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
--LogBlue("reMaintimes:"..reMaintimes)
LogBlue("reMaintimes:"..reMaintimes)
self.recruitTimesUpdate.text = string.format("召唤<color=#F27D0F>%s</color>次必得UP神将",reMaintimes)
local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy)
--LogBlue(info.endTime)
--LogBlue(info.startTime)
LogBlue(info.endTime)
LogBlue(info.startTime)
info = info.endTime - info.startTime
info = self:TimeToDHMS(info)
self.recruitTimeUpdate.text = string.format("活动剩余时间:"..info)
@ -213,9 +213,9 @@ function TimeLimitedCall:TimeToDHMS(second)
end
function TimeLimitedCall:GetMissionStateById(num,activityId)
--LogBlue("activityId:"..activityId.. ",num:"..num)
LogBlue("activityId:"..activityId.. ",num:"..num)
local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据
--LogBlue(mission.progress.." "..mission.state)
LogBlue(mission.progress.." "..mission.state)
return mission.progress,mission.state
end

View File

@ -441,7 +441,7 @@ function this:ShopItemAdapter(shopItem, itemData)
end
end
-- 消耗物品的信息
itemPrice.text = PrintWanNum4(tonumber(price))--tostring(price)
itemPrice.text = PrintWanNum2(tonumber(price))--tostring(price)
costIcon.sprite = SetIcon(costId)
-- 判断商品栏位是否解锁

Binary file not shown.