From 43a370f5a84737802ed075eede82ffbd4d0747cf Mon Sep 17 00:00:00 2001 From: JieLing Date: Mon, 26 Oct 2020 10:56:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cc90e93011..d348540feb 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1843,7 +1843,7 @@ GENERAL_POPUP_TYPE={ QinglongSerectTreasureBuyLevel = 22,--青龙秘宝购买等级 HeavenUnlockExtraRewardPanel = 23, --青龙秘宝解锁 XiaoYaoYouItemExchange = 24, --逍遥游道具兑换 - + SheJiCheckGuild = 25,--社稷大典公会检查 } --抽卡类型 diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index b79f44e9f2..16e6603cf3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -815,10 +815,6 @@ end function this.InitLeiJiChongZhiData(_type) local id = 0 local type = _type -<<<<<<< HEAD - LogGreen("type") -======= ->>>>>>> 0a610313a... 主题活动图片资源修改提交,累计重置红点检测修改提交 if type then id = ActivityGiftManager.IsActivityTypeOpen(type) if (not id) or id == 0 then @@ -827,13 +823,6 @@ function this.InitLeiJiChongZhiData(_type) else id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.AccumulativeRechargeExper) if (not id) or id == 0 then -<<<<<<< HEAD - id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.type) - if (not id) or id == 0 then - return nil - end - else -======= id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct_recharge) if (not id) or id == 0 then return nil @@ -842,18 +831,13 @@ function this.InitLeiJiChongZhiData(_type) end else type = ActivityTypeDef.AccumulativeRechargeExper ->>>>>>> 0a610313a... 主题活动图片资源修改提交,累计重置红点检测修改提交 local tempConfig = ConfigManager.GetConfigData(ConfigName.GlobalActivity,id) if tempConfig and tempConfig.ShowArt == 1 then return nil end end end -<<<<<<< HEAD -======= - LogGreen("id:"..id) ->>>>>>> 0a610313a... 主题活动图片资源修改提交,累计重置红点检测修改提交 this.LeiJiChongZhiData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", id) local allMissionData = ActivityGiftManager.GetActivityTypeInfo(type)