From 644d984c0aca079898c680713622ea0217264ced Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 4 Nov 2020 14:24:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E9=99=86=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Login/LoginPanel.lua | 2 +- .../~Lua/Modules/Vip/VipManager.lua | 24 +++++++++---------- .../~Lua/Modules/WorkShop/WorkShopManager.lua | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 75d23d6042..0584cdaedd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -445,7 +445,7 @@ function this.ExecuteLoading() --[[[12] =]] function() NetManager.GetActivityAllRewardRequest(LoadingPanel.OnStep) end, -- 活动奖励 --[[[13] =]] function() NetManager.RequestBaseArenaData(LoadingPanel.OnStep) end, -- 竞技场 --[[[14] =]] function() ShopManager.InitData(LoadingPanel.OnStep) end, -- 商店 - --[[[15] =]] function() NetManager.GetWorkShopInfoRequest(LoadingPanel.OnStep) end, -- 工坊? + --[[[15] =]] --function() NetManager.GetWorkShopInfoRequest(LoadingPanel.OnStep) end, -- 工坊? --[[[16] =]] function() ChatManager.InitData(LoadingPanel.OnStep) end, -- 聊天 --[[[17] =]] function() NetManager.GetAllFunState(LoadingPanel.OnStep) end, -- 功能开启信息 --[[[18] =]] function() NetManager.RequestGetFriendInfo(1, LoadingPanel.OnStep) end, -- 好友 diff --git a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua index ce1be2b7b6..3fe1e37c5a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Vip/VipManager.lua @@ -412,18 +412,18 @@ function this.CheckNewVipRP() end function this.CheckGrowthPackagePointStatus()--成长礼包 - local redointTime =PlayerPrefs.GetInt(PlayerManager.uid.."czlb", 0) - local rechargeNum= VipManager.GetChargedNum()--已经充值的金额 - local shopData = ShopManager.GetShopDataByType(SHOP_TYPE.VIP_GIFT).storeItem - local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) - for i = 1, #shopData do - local boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.VIP_GIFT, shopData[i].id) - if rechargeNum >= shopItemConfig[shopData[i].id].BuyRule[2] and boughtNum == 0 then - if redointTime == 0 then - return true - end - end - end + -- local redointTime =PlayerPrefs.GetInt(PlayerManager.uid.."czlb", 0) + -- local rechargeNum= VipManager.GetChargedNum()--已经充值的金额 + -- local shopData = ShopManager.GetShopDataByType(SHOP_TYPE.VIP_GIFT).storeItem + -- local shopItemConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) + -- for i = 1, #shopData do + -- local boughtNum = ShopManager.GetShopItemHadBuyTimes(SHOP_TYPE.VIP_GIFT, shopData[i].id) + -- if rechargeNum >= shopItemConfig[shopData[i].id].BuyRule[2] and boughtNum == 0 then + -- if redointTime == 0 then + -- return true + -- end + -- end + -- end return false end diff --git a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua index 8daca9ef2a..e2e6099193 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopManager.lua @@ -302,7 +302,7 @@ function this.InitializeTechnologyDataList(backTechnologyInfo) end this.SetTreePointOpenState() this.GetAllTreeLvEndNum() - this.WorkShopTreeRefreshNum = ShopManager.GetShopItemData(SHOP_TYPE.FUNCTION_SHOP, 10011).buyNum + --this.WorkShopTreeRefreshNum = ShopManager.GetShopItemData(SHOP_TYPE.FUNCTION_SHOP, 10011).buyNum end --增加天赋树刷新次数 function this.SetTreeRefreshNum(_num)