From b650999f962fa2436fcd751ebaccc1eb397bdff6 Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Sat, 10 Jul 2021 23:38:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E9=80=9F=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E8=AF=AD=E8=A8=80=E4=BA=A7=E7=94=9F=E5=A4=A7=E9=87=8F?= =?UTF-8?q?=E5=86=85=E5=AD=98=E5=9E=83=E5=9C=BE=E5=B9=B6=E5=9C=A8=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E4=B8=BB=E8=8F=9C=E5=8D=95=E6=97=B6=E5=8D=A1=E9=A1=BF?= =?UTF-8?q?=20close=20#118?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Zframework/languages.lua | 12 +++++++----- parts/scenes/lang.lua | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/Zframework/languages.lua b/Zframework/languages.lua index 35ecf827..95b7ee56 100644 --- a/Zframework/languages.lua +++ b/Zframework/languages.lua @@ -34,11 +34,13 @@ function LANG.init(langList,publicText)--Attention, calling this will destory al LANG.init,LANG.setLangList,LANG.setPublicText=nil function LANG.set(l) - text=langList[l] - WIDGET.setLang(text.WidgetText) - for k,v in next,drawableText do - if text[k]then - v:set(text[k]) + if text~=langList[l]then + text=langList[l] + WIDGET.setLang(text.WidgetText) + for k,v in next,drawableText do + if text[k]then + v:set(text[k]) + end end end end diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index f2b61fba..693f7403 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -15,12 +15,14 @@ function scene.sceneBack() FILE.save(SETTING,'conf/settings') end -local function setLang(n) - SETTING.lang=n - LANG.set(n) - TEXT.show(langList[n],640,500,100,'appear',.626) +local function _setLang(n) + return function() + SETTING.lang=n + LANG.set(n) + TEXT.show(langList[n],640,500,100,'appear',.626) + collectgarbage() + end end -local function _setLang(n)return function()setLang(n)end end scene.widgetList={ WIDGET.newButton{x=200,y=100,w=200,h=120,fText=langList[1],color='R',font=35,code=_setLang(1)}, WIDGET.newButton{x=420,y=100,w=200,h=120,fText=langList[2],color='dR',font=35,code=_setLang(2)},