tcx_xiyou_yueNan
			
			
		
		
							parent
							
								
									9c29be2c72
								
							
						
					
					
						commit
						f01696bb00
					
				| 
						 | 
					@ -572,6 +572,7 @@ function this.IsActivityTypeOpen(type)
 | 
				
			||||||
    table.walk(globalActConfigs, function(actConfigInfo)
 | 
					    table.walk(globalActConfigs, function(actConfigInfo)
 | 
				
			||||||
        if this.mission and this.mission[actConfigInfo.Id] then
 | 
					        if this.mission and this.mission[actConfigInfo.Id] then
 | 
				
			||||||
            activityId = actConfigInfo.Id
 | 
					            activityId = actConfigInfo.Id
 | 
				
			||||||
 | 
					            LogError("找到服务器活动相关配置,类型:" .. tostring(activityId))
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
    end)
 | 
					    end)
 | 
				
			||||||
    return activityId
 | 
					    return activityId
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -9,7 +9,7 @@ local TabBox = require("Modules/Common/TabBox")
 | 
				
			||||||
local BTNS = {
 | 
					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 },
 | 
					    [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 },
 | 
					    --[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 = ActivityTypeDef.chaozhifanli30,goodsType = GoodsTypeDef.chaozhifanli,redpoint= RedPointType.chaozhifanli30,price = 30},
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
local curPage = 1
 | 
					local curPage = 1
 | 
				
			||||||
local redList = {}
 | 
					local redList = {}
 | 
				
			||||||
| 
						 | 
					@ -116,7 +116,7 @@ function PremiumRebatePanel:Refresh(isTop, isAni)
 | 
				
			||||||
            return sorts[a.state] < sorts[b.state]
 | 
					            return sorts[a.state] < sorts[b.state]
 | 
				
			||||||
        end
 | 
					        end
 | 
				
			||||||
    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.giftData = DynamicActivityManager.GetGiftDataByType({{DataType.Direct,BTNS[curPage].goodsType,BTNS[curPage].showType}})
 | 
				
			||||||
    this.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId",
 | 
					    this.actConfigData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId",
 | 
				
			||||||
        this.actData.activityId)
 | 
					        this.actData.activityId)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1981,7 +1981,6 @@ function this.RefreshActivityShow()
 | 
				
			||||||
        local showTab = activityTabs[k].go.gameObject.activeSelf
 | 
					        local showTab = activityTabs[k].go.gameObject.activeSelf
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        local ishow = DynamicActivityManager.IsQualifiled(v.Id)
 | 
					        local ishow = DynamicActivityManager.IsQualifiled(v.Id)
 | 
				
			||||||
 | 
					 | 
				
			||||||
        if ishow then
 | 
					        if ishow then
 | 
				
			||||||
            if v.RpType > 0 then
 | 
					            if v.RpType > 0 then
 | 
				
			||||||
                --绑定新的红点
 | 
					                --绑定新的红点
 | 
				
			||||||
| 
						 | 
					@ -2006,6 +2005,9 @@ function this.RefreshActivityShow()
 | 
				
			||||||
                end
 | 
					                end
 | 
				
			||||||
            elseif v.ActiveType > 0 then
 | 
					            elseif v.ActiveType > 0 then
 | 
				
			||||||
                local activityId = ActivityGiftManager.IsActivityTypeOpen(v.ActiveType)
 | 
					                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 activityId and activityId > 0 and ActivityGiftManager.IsQualifiled(v.ActiveType) then
 | 
				
			||||||
                    if v.ActiveType == 42 then
 | 
					                    if v.ActiveType == 42 then
 | 
				
			||||||
                        if ActivityGiftManager.CheckSupremeMission(1, true)
 | 
					                        if ActivityGiftManager.CheckSupremeMission(1, true)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue