From 4cc4bc87aa2065f3a426c5d7ab5563c79ea5efed Mon Sep 17 00:00:00 2001 From: gaoxin Date: Mon, 24 May 2021 14:09:11 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E6=9C=AC=E5=9C=B0=E5=8C=96?= =?UTF-8?q?=E3=80=91=E5=85=AC=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Login/NoticePopup.lua | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua index f7096df2cb..107152f774 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/NoticePopup.lua @@ -69,6 +69,7 @@ function this.GetNotice(str) -- value.content="一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。一群人在这里忙碌,嬉闹着搭帐篷建营地这是一个由公司同事私下组织的野营活动,当然,全都是年轻人,因为要背着帐篷等装备登山远足,年长一些的人体力不够原本大家是希望公司组织一次野营的,但公司每年都是组团旅游,有导游开大巴的那种,所以今年,很多同事干脆不跟随公司一起,反而是让几个有户外经验的同事领头自己组织,所以也有了这次登山野营。" -- LogError("title:"..value.title.." content:"..value.content.." type:"..value.type) -- end + this.TitleText.text=Language[11147] if data.list and #data.list>0 then this.ContentText.gameObject:SetActive(false) table.sort(data.list, function(a, b) @@ -97,9 +98,15 @@ function this.GetNotice(str) elseif value.type==4 then img.gameObject:SetActive(false) end - Util.GetGameObject(prelist[key],"Image/title"):GetComponent("Text").text=value.title + -- 表体 + local title = Util.GetGameObject(prelist[key],"Image/title"):GetComponent("Text") + local titleStr = string.split(value.title,"|") + title.text = titleStr[GetCurLanguage()+1] or titleStr[1] + -- 内容 local content=Util.GetGameObject(prelist[key],"content"):GetComponent("Text") - content.text=value.content + local contentStr = string.split(string.gsub(value.content, "\\n", "\n"),"|") + content.text = contentStr[GetCurLanguage()+1] or contentStr[1] + local down=Util.GetGameObject(prelist[key],"Image/down") local left=Util.GetGameObject(prelist[key],"Image/left") local isOpen=true @@ -107,12 +114,12 @@ function this.GetNotice(str) left:SetActive(not isOpen) content.gameObject:SetActive(isOpen) local btn=Util.GetGameObject(prelist[key],"Image") - Util.AddClick(btn,function() - isOpen=not isOpen - down:SetActive(isOpen) - left:SetActive(not isOpen) - content.gameObject:SetActive(isOpen) - end) + Util.AddClick(btn,function() + isOpen=not isOpen + down:SetActive(isOpen) + left:SetActive(not isOpen) + content.gameObject:SetActive(isOpen) + end) end -- local titleStr = string.split(data.parms.title,"|") -- this.TitleText.text =titleStr[GetCurLanguage()+1] or titleStr[1] @@ -120,7 +127,6 @@ function this.GetNotice(str) -- this.ContentText.text = contentStr[GetCurLanguage()+1] or contentStr[1] else this.ContentText.gameObject:SetActive(true) - this.TitleText.text=Language[11147] this.ContentText.text=Language[11148] end end From 80691b1a9ec2e4ee5b932133cb38d77ca63a1464 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 25 May 2021 11:22:30 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=90=E8=B4=AD=E6=AC=A1=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit f7235b087beed6fdfed3a0698ab4bf7054a3755e) --- Assets/ManagedResources/~Lua/View/ShopViewNew.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index a325ad08fc..fcda088234 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -459,6 +459,7 @@ function ShopViewNew:ShopItemAdapter(shopItem, itemData) -- 限购 limitBg:SetActive(maxLimitCount ~= -1) limitTimes.text = maxLimitCount + limitTimes.gameObject:SetActive(maxLimitCount ~= -1) -- 售空 限购次数为-1 表示不限购 local isEmpty = maxLimitCount ~= -1 and curBuyCount >= maxLimitCount if curBuyCount >= maxLimitCount then