diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua index 50bfe1f2f1..125f3d38c0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/TimeLimitedCall.lua @@ -203,12 +203,9 @@ function TimeLimitedCall:RefreshNextLevelReward() if reMaintimes == 0 then reMaintimes = ConfigManager.GetConfigData(ConfigName.LotterySpecialConfig,18).Count end - --LogBlue("reMaintimes:"..reMaintimes) self.recruitTimesUpdate.text = string.format(Language[12229],reMaintimes) local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) - --LogBlue(info.endTime) - --LogBlue(info.startTime) info = info.endTime - info.startTime info = self:TimeToDHMS(info) self.recruitTimeUpdate.text = string.format(Language[12230]..info) @@ -227,9 +224,7 @@ function TimeLimitedCall:TimeToDHMS(second) end function TimeLimitedCall:GetMissionStateById(num,activityId) - --LogBlue("activityId:"..activityId.. ",num:"..num) local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据 - LogBlue(mission.progress.." "..mission.state) return mission.progress,mission.state end @@ -243,7 +238,6 @@ function TimeLimitedCall:RefreshGetHeroTimes() local freeTime= 0 if freeTimesId>0 then freeTime = PrivilegeManager.GetPrivilegeRemainValue(freeTimesId) - LogBlue("freeTime:"..freeTime) RecruitManager.freeUseTimeList[freeTimesId]=freeTime end --按钮赋值 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua index d4c88af40e..b2daccf33f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua @@ -10,7 +10,6 @@ end function PrivilegeManager.InitPrivilegeData(data) this._PrivilegeInfoList = {} for i = 1, #data do - --[[data:从后端接受到的数据 data是个列表 列表元素的结构id与priviledge的id对应 usedTimes使用次数 endTime 有效时间]] this._PrivilegeInfoList[data[i].id] = { id = data[i].id, usedTimes = data[i].usedTimes, endTime = data[i].effectTime } end @@ -151,7 +150,7 @@ function PrivilegeManager.GetPrivilegeUsedTimes(privilegeType) local usedTimes = 0 for _, config in ipairs(privilegeList) do local privilegeId = config.Id - local serData = this._PrivilegeInfoList[privilegeId] + local serData = this._PrivilegeInfoList[privilegeId] if serData then usedTimes = usedTimes + serData.usedTimes end diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua index 6032fb5c8c..5be9d4c084 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitManager.lua @@ -33,7 +33,7 @@ function this.RecruitRequest(recruitType, func, privilegeId) if BagManager.GetItemCountById(itemId) >= itemNum or (this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1) or isFindFairyFree then NetManager.RecruitRequest(recruitType, function(msg) local lotteryType=ConfigManager.GetConfigData(ConfigName.LotterySetting,recruitType).LotteryType --若是活动招募,目前活动招募是东海寻仙,分多期 - if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or RecruitType.TimeLimitSingle==recruitType or lotteryType==3) then --若某抽卡类型有免费次数 + if (RecruitType.Single == recruitType or RecruitType.NormalSingle==recruitType or RecruitType.TimeLimitSingle==recruitType or RecruitType.QianKunBoxSingle==recruitType) then --若某抽卡类型有免费次数 if this.freeUseTimeList[privilegeId] and this.freeUseTimeList[privilegeId] >= 1 then PrivilegeManager.RefreshPrivilegeUsedTimes(privilegeId, 1) this.freeUseTimeList[privilegeId] = PrivilegeManager.GetPrivilegeRemainValue(privilegeId) diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua index 77b197d6c9..d7fdd13a89 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/EquipSellSelectPopup.lua @@ -76,10 +76,14 @@ function EquipSellSelectPopup:BindEvent() if starStateTable[i] then starList[i] = i end - end + end + if LengthOfTable(qualityList) == 0 or LengthOfTable(starList) == 0 then + PopupTipPanel.ShowTip("未查询到符合条件的装备!") + return + end local data = BagManager.GetEquipDataByEquipQualityAndStar(qualityList,starList) if #data < 1 then - PopupTipPanel.ShowTip("没有满足条件的装备") + PopupTipPanel.ShowTip("未查询到符合条件的装备!") return end self:ClosePanel()