diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua index 4882c20aaf..00a7d18223 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/LingMaiFormation.lua @@ -72,7 +72,8 @@ function this.StartFight() if this.nodeData.uid == PlayerManager.uid then this.root:ClosePanel() else - NetManager.LingMaiBattleRequest(this.nodeData.Id,function (msg) + NetManager.LingMaiBattleRequest(this.nodeData.Id,2030,function (msg) + PrivilegeManager.RefreshPrivilegeUsedTimes(2030, 1)--更新特权 this.root:ClosePanel() @@ -81,7 +82,6 @@ function this.StartFight() UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.LINGMAIMIJING,function () local arg = {} arg.panelType=2 - LogRed("msg.result:"..tostring(msg.result)) arg.result = msg.result arg.blue = {} arg.blue.uid = PlayerManager.uid diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua index b0c62526a3..93d973d7c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingManager.lua @@ -105,4 +105,26 @@ function this.OpenRecord() end) end +function this.CheckPrivilage(func) + -- LogBlue("特权2030:"..tostring(PrivilegeManager.GetPrivilegeRemainValue(2030)).." 特权2031:"..tostring(PrivilegeManager.GetPrivilegeRemainValue(2031))) + if PrivilegeManager.GetPrivilegeRemainValue(2030) <= 0 then + if PrivilegeManager.GetPrivilegeRemainValue(2031) > 0 then + local costId, finalNum, oriCostNum = ShopManager.calculateBuyCost(SHOP_TYPE.FUNCTION_SHOP,10044, 1) + local itemName = ConfigManager.GetConfigData(ConfigName.ItemConfig,costId).Name + MsgPanel.ShowTwo(string.format( Language[10516],finalNum,itemName), nil, function() + --买东西 + ShopManager.RequestBuyShopItem(SHOP_TYPE.FUNCTION_SHOP,10044,1,function() + PopupTipPanel.ShowTip(Language[10517]) + PrivilegeManager.RefreshPrivilegeUsedTimes(2031, 1)--更新特权 + func() + end) + end) + else + PopupTipPanel.ShowTip("今日已无挑战次数!") + end + else + func() + end +end + return LingMaiMiJingManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua index fe039c7ed1..6c6226c6de 100644 --- a/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/LingMaiMiJing/LingMaiMiJingPanel.lua @@ -123,7 +123,7 @@ function LingMaiMiJingPanel:OnShow() self:SetTime() self:SetMydata() self:SetVeins() - self.groupList = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.LodeConfig,"Group",lodeConfig[LingMaiMiJingManager.myPlaceId].Group) + self.groupList = ConfigManager.TryGetAllConfigsDataByKey(ConfigName.LodeConfig,"Group",lodeConfig[self.data.lingmaiData[1].Id].Group) self.lastBtn:SetActive(LingMaiMiJingManager.curPage - 1 > 0) self.nextBtn:SetActive(LingMaiMiJingManager.curPage + 1 <= 50) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 0cbddf8f14..e5fa95a444 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -6096,9 +6096,10 @@ function NetManager.GetLingMaiInfoRequest(_page, func) end -- 灵脉秘境请求战斗 -function NetManager.LingMaiBattleRequest(_id, func) +function NetManager.LingMaiBattleRequest(_id,_privilageTypeId, func) local data = ArenaInfoProto_pb.CrossLingmaiSecretAreaRequest() data.id = _id + data.privilageTypeId = _privilageTypeId local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.CrossLingmaiSecretAreaRequest, MessageTypeProto_pb.CrossLingmaiSecretAreaResponse, msg, function(buffer) local data = buffer:DataByte() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 6b0988b43f..7a317b424a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -489,7 +489,7 @@ function this.SpecialBtnShow() this.btnList[1]:SetActive(not bool) this.btnList[2]:SetActive(not bool) this.btnList[3]:SetActive(bool) - if LingMaiMiJingManager.myPlaceId < this.data.Id then + if LingMaiMiJingManager.myPlaceId ~= 0 and LingMaiMiJingManager.myPlaceId < this.data.Id then this.btnList[2]:SetActive(false) end end @@ -555,9 +555,15 @@ end --灵脉秘境 function this.LingMaiFormaion() - this:ClosePanel() - LogRed("data,Id:"..tostring(this.data)) - UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, this.data) + if this.data.uid == PlayerManager.uid then + this:ClosePanel() + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, this.data) + else + LingMaiMiJingManager.CheckPrivilage(function () + this:ClosePanel() + UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.LINGMAIMIJING, this.data) + end) + end end --界面关闭时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua index 1a87631062..0037326f0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup_extra.lua @@ -93,7 +93,7 @@ function this.RefreshBtnShow() this.infoPopup.btnList[1]:SetActive(false) this.infoPopup.btnList[2]:SetActive(true) this.infoPopup.btnList[3]:SetActive(false) - if LingMaiMiJingManager.myPlaceId < this.data.Id then + if LingMaiMiJingManager.myPlaceId ~= 0 and LingMaiMiJingManager.myPlaceId < this.data.Id then this.infoPopup.btnBox:SetActive(false) this.infoPopup.btnList[2]:SetActive(false) end