diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 06980219d9..f2227aa131 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index b4562d3d6e..a6b903ded6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -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("召唤%s次必得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 diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index 528435f535..1a559d3c1e 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -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) -- 判断商品栏位是否解锁 diff --git a/data_execl/base_data/GlobalActivity.xlsx b/data_execl/base_data/GlobalActivity.xlsx index 5ceb82b19c..c959815009 100644 Binary files a/data_execl/base_data/GlobalActivity.xlsx and b/data_execl/base_data/GlobalActivity.xlsx differ diff --git a/data_execl/base_data/ItemConfig.xlsx b/data_execl/base_data/ItemConfig.xlsx index 83d2cc5bba..be5279215d 100644 Binary files a/data_execl/base_data/ItemConfig.xlsx and b/data_execl/base_data/ItemConfig.xlsx differ diff --git a/data_execl/base_data/LotteryRewardConfig.xlsx b/data_execl/base_data/LotteryRewardConfig.xlsx index 78077b6698..94ac804ad2 100644 Binary files a/data_execl/base_data/LotteryRewardConfig.xlsx and b/data_execl/base_data/LotteryRewardConfig.xlsx differ diff --git a/data_execl/base_data/LotterySetting.xlsx b/data_execl/base_data/LotterySetting.xlsx index 1445565aeb..a5bc3b52e5 100644 Binary files a/data_execl/base_data/LotterySetting.xlsx and b/data_execl/base_data/LotterySetting.xlsx differ diff --git a/data_execl/base_data/LotterySpecialConfig.xlsx b/data_execl/base_data/LotterySpecialConfig.xlsx index 28548975ed..76e3317b67 100644 Binary files a/data_execl/base_data/LotterySpecialConfig.xlsx and b/data_execl/base_data/LotterySpecialConfig.xlsx differ diff --git a/data_execl/base_data/StoreConfig.xlsx b/data_execl/base_data/StoreConfig.xlsx index 9a83c56fcb..92406274ae 100644 Binary files a/data_execl/base_data/StoreConfig.xlsx and b/data_execl/base_data/StoreConfig.xlsx differ diff --git a/data_execl/base_data/StoreTypeConfig.xlsx b/data_execl/base_data/StoreTypeConfig.xlsx index 621c32fc20..ced944acd8 100644 Binary files a/data_execl/base_data/StoreTypeConfig.xlsx and b/data_execl/base_data/StoreTypeConfig.xlsx differ