diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab index f81d2cebb1..6cac8b7e84 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ConRechargePage.prefab @@ -34,8 +34,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -398.7} - m_SizeDelta: {x: 1040, y: 842.2} + m_AnchoredPosition: {x: 0, y: -375.7} + m_SizeDelta: {x: 1040, y: 796.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2720652094624033988 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua index 17126c1c5a..214167754e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua @@ -286,6 +286,8 @@ end -- 初始化 function this.InitPanelData() + this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) + this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) if fightType == BATTLE_TYPE.GUILD_BOSS and fightType == BATTLE_TYPE.GUILD_CAR_DELAY then this.myDamage = 0 this.myDamageLevel = 0 @@ -299,7 +301,6 @@ function this.InitPanelData() end) end elseif fightType == BATTLE_TYPE.XINJIANG then - this.dmg2:SetActive(fightType == BATTLE_TYPE.XINJIANG) boxList[1]:SetActive(true) this.myDamage = 0 this.myDamageLevel = 0 @@ -319,7 +320,6 @@ function this.InitPanelData() local actData = CommonActPageManager.GetData(ActivityTypeDef.TaSuiLingXiao) local boxs = ConfigManager.GetConfigDataByKey(ConfigName.NewHeroConfig,"Id",actData.activityId).BoxList local maxDmg = actData.value - this.dmg3:SetActive(fightType == BATTLE_TYPE.TASUILINGXIAO) this.myDamage = 0 this.myDamageLevel = 0 this.dmg3Text.text = string.format("0/%s",boxs[1][1]) 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/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条件触发(事件) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index e8d2a0a146..9fd73cc795 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -108,14 +108,13 @@ function this.GetExpertData(indexType,actType) if curData.rewards[i].missionId == actRewardConfigs[j].Id then if indexType == 3 then -- 3 积天豪礼 curData.rewards[i].otherData.Values = actRewardConfigs[j].Values[1][2] - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].otherData.Values,curData.rewards[i].otherData.Values) + curData.rewards[i].otherData.info = "" if curData.rewards[i].state == 1 then curData.rewards[i].otherData.state = 2 elseif curData.rewards[i].progress == 1 then curData.rewards[i].otherData.state = 0 else curData.rewards[i].otherData.state = 1 - curData.rewards[i].otherData.info = string.format("%s/%s",curData.rewards[i].progress,curData.rewards[i].otherData.Values) end else --日累计充值 达人 if actType == ActivityTypeDef.AccumulativeRechargeExper then 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 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)