From 940d5fa3eef0ed09ddc3553abff6588caa110c52 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <1545929779@qq.com> Date: Mon, 19 Jun 2023 16:16:12 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=88=B7=E5=86=B2=E7=89=B9=E6=9D=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 485ad2f4338b252254e81c3b3e49058e01599cad. --- .../~Lua/Modules/ActivityGift/ActivityGiftManager.lua | 3 +-- .../~Lua/Modules/Operating/GMShuaChongTeQuan.lua | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index b203ab7f32..dc3cfc131b 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -263,8 +263,7 @@ function this.CheckImGMRedPoint() local activityData=ActivityGiftManager.GetActivityInfoByType(10301) if activityData and activityData.mission then for i = 1, #activityData.mission do - --屏蔽2201特权活动 - if activityData.mission[i].missionId~=2201 and activityData.mission[i].state==1 then + if activityData.mission[i].state==1 then return true end end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua index 8244cdabc1..bff6627842 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/GMShuaChongTeQuan.lua @@ -5,11 +5,10 @@ GMShuaChongTeQuan = Inherit(BasePanel) self=GMShuaChongTeQuan local sortingOrder = 0 local TabBox = require("Modules/Common/TabBox") -local _TabData={ - --[1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "刷充GM",img = "gm_shuachong_scGM_01_zh",id=2201,scale=0,all=0 }, - [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级特权" ,img = "gm_shuachong_cjGM_01_zh",id=2202,scale=6,all=30 }, - [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神级特权" ,img = "gm_shuachong_sjGM_01_zh",id=2203,scale=5,all=176 }, - [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上特权",img = "gm_shuachong_wsGM_01_zh",id=2204,scale=2,all=1640 }, +local _TabData={ [1] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "刷充GM",img = "gm_shuachong_scGM_01_zh",id=2201,scale=0,all=0 }, + [2] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "超级GM" ,img = "gm_shuachong_cjGM_01_zh",id=2202,scale=6,all=30 }, + [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "神级GM" ,img = "gm_shuachong_sjGM_01_zh",id=2203,scale=5,all=176 }, + [4] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "无上GM",img = "gm_shuachong_wsGM_01_zh",id=2204,scale=2,all=1640 }, } -- function GMShuaChongTeQuan:New(gameObject)