From f6463e72c8468e8266821419544e74801bd36426 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 10 Jan 2022 14:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=99=90=E6=97=B6=E5=8D=87=E6=98=9F?= =?UTF-8?q?=E3=80=91=E6=B7=BB=E5=8A=A0=E9=94=81=E5=AE=9A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/UpStarGift.lua | 13 ++++++++++++- .../~Lua/Modules/UpStar/UpStarPre.lua | 8 +++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua index 3ef6b96754..d45edf6ceb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/UpStarGift.lua @@ -111,7 +111,18 @@ function UpStarGift:BindEvent() PopupTipPanel.ShowTip("当前已处于锁定状态") return end - NetManager.UpStarActivitySelectRequest(self.actId, choose) + + local con = ConfigManager.TryGetConfigData(ConfigName.HeroConfig, choose) + if not con then + LogError("未找到神将:"..tostring(choose)) + return + end + local msg = string.format("%s\n将锁定为本次活动的指定神将\n\n锁定后无法修改", con.ReadingName) + MsgPanel.ShowTwo(msg, nil, function() + NetManager.UpStarActivitySelectRequest(self.actId, choose, function() + PopupTipPanel.ShowTip("锁定成功") + end) + end, nil, "锁 定") end) end diff --git a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua index ab88080226..a0ede58a1d 100644 --- a/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/UpStar/UpStarPre.lua @@ -32,7 +32,7 @@ end function UpStarPre:BindEvent() Util.AddOnceClick(self.btnBuy.gameObject, function() if self.isTemp then - PopupTipPanel.ShowTip("请先选择一个神将") + PopupTipPanel.ShowTip("请先选择并锁定一个神将") return end if self.data.state == 0 then @@ -47,7 +47,7 @@ function UpStarPre:BindEvent() Util.AddOnceClick(self.GetBtn, function() if self.isTemp then - PopupTipPanel.ShowTip("请先选择一个神将") + PopupTipPanel.ShowTip("请先选择并锁定一个神将") return end NetManager.GetActivityRewardRequest(self.data.missionId,self.actData.activityId,function(msg) @@ -116,7 +116,9 @@ function UpStarPre:SetShows(key,shows,parent) if self.parent.GetCurChooseHero then self.choose, self.isTemp = self.parent:GetCurChooseHero() -- 临时状态不再显示锁头 - if self.isTemp then + if self.data.state == 0 and not self.isTemp then + self.itemList[key][i].lock.gameObject:SetActive(true) + else self.itemList[key][i].lock.gameObject:SetActive(false) end -- 未选择时角色和角色碎片显示问号