Merge branch 'china/dev-c' of http://60.1.1.230/gaoxin/JL_Client into china/dev-c

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])

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条件触发(事件)

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

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)