From ca9594fefcfa25f5acadcaab53b8c363fb53dbcf Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 26 Apr 2021 20:08:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E8=B6=85=E5=80=BC=E5=9F=BA?= =?UTF-8?q?=E9=87=91=E3=80=91=E6=98=AF=E5=90=A6=E5=8F=AF=E8=B4=AD=E4=B9=B0?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Operating/UppperMonthCard.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua index 930a2a583b..1125c1d405 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua @@ -170,7 +170,9 @@ end --- 根据是否购买了显示信息 function UpperMonthCard:SetBuyState() local isActive = VipManager.GetMonthCardOpenState() - local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType) + -- local isBought = OperatingManager.IsBaseBuy(self.chargerBaseType) + local canBuyNum = OperatingManager.GetLeftBuyTime(self.chargerBaseType, self.baseType) + local isBought = canBuyNum and canBuyNum <= 0 self.boughtPanel:SetActive(isBought) self.buyPanel:SetActive(not isBought) Util.SetGray(self.btnBuy, not isActive) From 460ec366cbd9702765f3f16bb68bc34f6279e6da Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 26 Apr 2021 20:27:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E7=A4=BC=E5=8C=85=E3=80=91?= =?UTF-8?q?=E5=8E=BB=E6=8E=89LevelLinit=20=E5=AD=97=E6=AE=B5=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/DynamicActivityManager.lua | 4 ++-- .../~Lua/Modules/Operating/OperatingManager.lua | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index 63bda210c7..98e12ef19e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -489,9 +489,9 @@ function this.GetGiftDataByType(ShopData) if ShopData[i][1] == DataType.Direct and RECHARGEABLE then local topspeedData = this.ResetShopData(OperatingManager.GetGiftGoodsInfoList(ShopData[i][2]), ShopData[i][3], ShopData[i][1]) for i = 1, #topspeedData do - if lv >= topspeedData[i].data.shopItemData.LevelLinit[1] and lv <= topspeedData[i].data.shopItemData.LevelLinit[2] then + -- if lv >= topspeedData[i].data.shopItemData.LevelLinit[1] and lv <= topspeedData[i].data.shopItemData.LevelLinit[2] then table.insert(shopData,topspeedData[i]) - end + -- end end elseif ShopData[i][1] == DataType.Shop then local topspeedData = this.ResetShopData(ShopManager.GetShopDataByType(ShopData[i][2]).storeItem, ShopData[i][2], ShopData[i][1]) diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 39499a2b7e..7e3ce002f0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -141,7 +141,8 @@ function this.GetGiftGoodsInfoList(type) end local newGiftGoodsInfoList = {} for k,v in pairs(giftGoodsInfoList[type]) do - if rechargeConfig[v.goodsId] and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2] then + --and PlayerManager.level >= rechargeConfig[v.goodsId].LevelLinit[1] and PlayerManager.level <= rechargeConfig[v.goodsId].LevelLinit[2] + if rechargeConfig[v.goodsId] then table.insert(newGiftGoodsInfoList,v) end end From 3d1857dfcdab153ad2830f1a25fa969d61dff8b8 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Mon, 26 Apr 2021 20:35:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E5=89=8D=E7=AB=AF=E6=8B=8D?= =?UTF-8?q?=E8=84=B8=E4=BF=AE=E6=94=B9=E3=80=91=E6=8F=90=E4=BA=A4=E2=80=94?= =?UTF-8?q?=E2=80=942?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Expert/PatFaceManager.lua | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua index b2d4e1ee19..7a44e9bd24 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/PatFaceManager.lua @@ -67,14 +67,23 @@ function this.GetFrontPatFaceAllDataTabs() end --检测所有拍脸 function this.GetPatFaceAllDataTabs() + local curAllDatas = {} local backData = this.GetBackPatFaceDaqta() + -- LogGreen("backData "..#backData) local FrontData = this.GetFrontPatFaceAllDataTabs() - if FrontData and #FrontData > 0 then - for i = 1, #FrontData do - table.insert(backData,FrontData[i]) + -- LogGreen("FrontData "..#FrontData) + if backData and #backData > 0 then + for i = 1, #backData do + table.insert(curAllDatas,backData[i]) end end - return backData + if FrontData and #FrontData > 0 then + for i = 1, #FrontData do + table.insert(curAllDatas,FrontData[i]) + end + end + -- LogGreen("curAllDatas "..#curAllDatas) + return curAllDatas end function this.PatFaceSpecialMonitorOpenRules(v,patFaceAllData,type,starUpGiftNum) --1等级 2关卡 3特劝等级 4功能开启时 5活动开启时 6公会战状态 7条件触发(事件)