From c6371664949fa7b65bf096d67b4affbc2aa7d062 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 1 Dec 2021 16:55:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E5=AE=9D?= =?UTF-8?q?=E9=98=81=E3=80=91=E7=A1=AE=E8=AE=A4=E6=A1=86=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/LingShouBaoGe.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua index c112f244a8..6cee7034e4 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua @@ -246,7 +246,6 @@ function LingShouBaoGe:refreshBtnShow() end function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTimesId,recruitType) - local generalType = id%2 == 0 and RecruitType.BaoGeSingle or RecruitType.BaoGeTen local num = id%2 == 0 and 1 or 10 --是否超过每日最大上限 if PrivilegeManager.GetPrivilegeRemainValue(RecruitMaxtimesId) < num then @@ -260,7 +259,7 @@ function LingShouBaoGe:Recruit(id,RecruitMaxtimesId,itemId,itemNum,state,freeTim end end if itemId == 16 and state == 0 then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,self.tenRecruit.Id, + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.RecruitConfirm,id, function() RecruitManager.RecruitRequest(id,function(msg) PrivilegeManager.RefreshPrivilegeUsedTimes(RecruitMaxtimesId,num) From 40fcfcdfc21c9725b3b74568c41d7cf67e0659f2 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 1 Dec 2021 17:02:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8C=96=E8=BA=AB=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Incarnation/IncarnationPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index 3996e3becb..75136d3f3b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -105,7 +105,7 @@ function IncarnationPanel:BindEvent() local singData = {} singData.title = "" singData.pro = {} - singData.tip = string.format("说明:每获得一种化身,全体神将获得如下属性加成:%s",IncarnationManager.SingleIncarnationProDes) + singData.tip = string.format("说明:每获得一种化身,全体神将获得如下属性加成:\n%s",IncarnationManager.SingleIncarnationProDes) table.insert(data,singData) -- for i = 1 ,#data do -- LogGreen("data[i]:"..data[i].title.." #pro:"..#data[i].pro)