diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index b7f271b74f..898e6280d3 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -572,6 +572,7 @@ function this.IsActivityTypeOpen(type) table.walk(globalActConfigs, function(actConfigInfo) if this.mission and this.mission[actConfigInfo.Id] then activityId = actConfigInfo.Id + LogError("找到服务器活动相关配置,类型:" .. tostring(activityId)) end end) return activityId diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua index 5d1b418345..974908c205 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/PremiumRebatePanel.lua @@ -8,8 +8,8 @@ local activityRewardConfig = ConfigManager.GetConfig(ConfigName.ActivityRewardCo local TabBox = require("Modules/Common/TabBox") local BTNS = { [1] = { bg1 = "b_baibao_andi", bg2 = "b_baibao_liangdi", text1 = "c_czfl_6yuan", text2 = "c_czfl_6yuan2", showType = 48, actType = ActivityTypeDef.chaozhifanli, goodsType = GoodsTypeDef.chaozhifanli, redpoint = RedPointType.chaozhifanli6, price = 6 }, - --[2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = 111,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 12}, - --[3] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 30}, + --[2] = { bg1 = "b_baibao_andi", bg2 = "b_baibao_liangdi", text1 = "c_czfl_18yuan", text2 = "c_czfl_18yuan", showType = 49, actType = 111, goodsType = GoodsTypeDef.chaozhifanli, redpoint = RedPointType.chaozhifanli30, price = 12 }, + [2] = {bg1 = "b_baibao_andi",bg2 = "b_baibao_liangdi",text1 = "c_czfl_18yuan",text2 = "c_czfl_18yuan",showType = 49,actType = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 30}, } local curPage = 1 local redList = {} @@ -116,7 +116,7 @@ function PremiumRebatePanel:Refresh(isTop, isAni) return sorts[a.state] < sorts[b.state] end end) - LogError("this.actData.activityId==" .. this.actData.activityId) + LogError("this.actData.activityId==" .. this.actData.activityId .. "/" .. tostring(#this.actData.mission)) --this.giftData = DynamicActivityManager.GetGiftDataByType({{DataType.Direct,BTNS[curPage].goodsType,BTNS[curPage].showType}}) this.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", this.actData.activityId) diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 1cf1052d58..64432498ff 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1981,7 +1981,6 @@ function this.RefreshActivityShow() local showTab = activityTabs[k].go.gameObject.activeSelf local ishow = DynamicActivityManager.IsQualifiled(v.Id) - if ishow then if v.RpType > 0 then --绑定新的红点 @@ -2006,6 +2005,9 @@ function this.RefreshActivityShow() end elseif v.ActiveType > 0 then local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType) + if activityTabs[k].go.gameObject.name == "tab12201" then + LogError("ssssssssssssssssssssssssssssssssssssss" .. tostring(activityId).."/"..tostring(ActivityGiftManager.IsQualifiled(v.ActiveType))) + end if activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then if v.ActiveType == 42 then if ActivityGiftManager.CheckSupremeMission(1, true)