From fb4d9e0d4510fb2bcae1862f1726406c0e5442cf Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 22 Aug 2020 22:27:52 +0800 Subject: [PATCH] commit --- Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua | 8 ++++---- .../Modules/Mission/QinglongSerectTreasureManager.lua | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 6 +++--- .../~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua | 3 ++- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index d703154d12..2d9d568c7f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1338,12 +1338,12 @@ function this.TimeFormat() end --青龙秘宝 local QingLong = not not ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody) - if dynamicAct then + if QingLong then local info = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.TreasureOfSomeBody) - info = info.endTime - PlayerManager.serverTime - info = math.floor(info/86400) + local tempTime = info.endTime - PlayerManager.serverTime + tempTime = math.floor(tempTime/86400) if ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.TreasureOfSomeBody) then - this.treasureOfSlText.text = info.."天" + this.treasureOfSlText.text = tempTime.."天" end end diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index 944f3e20a0..35d72ac390 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -97,7 +97,7 @@ function this.GetTrailWeekTime(msg) end function this.GetTimeStartToEnd() - local info= ActivityGiftManager.GetActivityInfoByType(this.activityId) + local info= ActivityGiftManager.GetActivityInfoByType(ActivityTypeDef.TreasureOfSomeBody) if info then local startTime= this.GetTimeShow(info.startTime) local endtime= this.GetTimeShow(info.endTime) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 00b51d6116..a8f6f916a5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -41,9 +41,9 @@ function this.SetBasicValues(giftGoodsList) local rechargeConfig = ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig, giftGoodsInfo.goodsId) - -- LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" - -- ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" - -- ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) + LogGreen("------充值活动-----------礼包类型:".. rechargeConfig.Type .." 礼包ID:".. giftGoodsInfo.goodsId .." 已购:" + ..giftGoodsInfo.buyTimes.." 开始:"..giftGoodsInfo.startTime.." 结束:" + ..giftGoodsInfo.endTime .. " 可购(没卵用):" .. giftGoodsInfo.dynamicBuyTimes) if giftGoodsInfoList[rechargeConfig.Type] then diff --git a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua index be43f383b2..07ad2052e6 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpGradePackage/UpGradePackagePanel.lua @@ -43,13 +43,14 @@ function this:BindEvent() if AppConst.isSDKLogin then PayManager.Pay({ Id = curGiftId }) else + LogBlue("curGiftId:"..curGiftId) NetManager.RequestBuyGiftGoods(curGiftId, function() FirstRechargeManager.RefreshAccumRechargeValue(curGiftId) CheckRedPointStatus(RedPointType.GrowthPackage)--成长礼包的红点检测 rechargeData.dynamicBuyTimes = rechargeData.dynamicBuyTimes - 1 --判断可购买次数是否为零,是剔除礼包信息 -- for i = 1, #curGiftList do - if rechargeData.dynamicBuyTimes == 0 then + if rechargeData.dynamicBuyTimes < 1 then OperatingManager.SetHadBuyGoodsId({curGiftId}) OperatingManager.RemoveItemInfoByType(GoodsTypeDef.DirectPurchaseGift, curGiftId) end