From aef4220ac0ce3b10634cebad0f038c90711b0dfd Mon Sep 17 00:00:00 2001 From: MrZ626 <1046101471@qq.com> Date: Mon, 6 Dec 2021 03:25:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=9C=BA=E5=9C=B016=E5=8F=B7=E9=A2=9C=E8=89=B2=E7=9A=84?= =?UTF-8?q?=E6=96=B9=E5=9D=97=E5=90=8D=E4=BD=8D=E7=BD=AE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF=20=E4=BC=98=E5=8C=96=E7=9A=AE=E8=82=A4?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E4=BA=A4=E4=BA=92=E6=95=88?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- parts/scenes/custom_field.lua | 4 +-- parts/scenes/setting_skin.lua | 47 +++++++++++++++++------------------ 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/parts/scenes/custom_field.lua b/parts/scenes/custom_field.lua index 7e9866e0..ed4cb1e6 100644 --- a/parts/scenes/custom_field.lua +++ b/parts/scenes/custom_field.lua @@ -428,8 +428,8 @@ function scene.draw() setFont(55) gc.setColor(1,1,1) for i=1,7 do - local skin=SETTING.skin[i] - mStr(text.block[i],500+skin%8*80,90+80*int(skin/8)) + local skin=SETTING.skin[i]-1 + mStr(text.block[i],580+(skin%8)*80,90+80*int(skin/8)) end end diff --git a/parts/scenes/setting_skin.lua b/parts/scenes/setting_skin.lua index 0d8ca3e1..4f36707a 100644 --- a/parts/scenes/setting_skin.lua +++ b/parts/scenes/setting_skin.lua @@ -78,43 +78,42 @@ local function _nextDir(i) end playEgg.hide=not selEggMode end - SFX.play('rotate') end scene.widgetList={ WIDGET.newText{name='title', x=80,y=50,font=70,align='L'}, WIDGET.newSelector{name='skinSet',x=780,y=100,w=320,list=SKIN.getList(),disp=SETval('skinSet'),code=SETsto('skinSet')}, - WIDGET.newButton{name='prev1', x=130,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(1)end}, - WIDGET.newButton{name='prev2', x=270,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(2)end}, - WIDGET.newButton{name='prev3', x=410,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(3)end}, - WIDGET.newButton{name='prev4', x=550,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(4)end}, - WIDGET.newButton{name='prev5', x=690,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(5)end}, - WIDGET.newButton{name='prev6', x=830,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(6)end}, - WIDGET.newButton{name='prev7', x=970,y=220,w=80,h=65,fText="↑",code=function()_prevSkin(7)end}, + WIDGET.newButton{name='prev1', x=130,y=220,w=80,h=65,sound='hold',font=40,fText="↑",code=function()_prevSkin(1)end}, + WIDGET.newButton{name='prev2', x=270,y=220,w=80,h=65,sound='hold',font=40,fText="↑",code=function()_prevSkin(2)end}, + WIDGET.newButton{name='prev3', x=410,y=220,w=80,h=65,sound='hold',font=40,fText="↑",code=function()_prevSkin(3)end}, + WIDGET.newButton{name='prev4', x=550,y=220,w=80,h=65,sound='hold',font=40,fText="↑",code=function()_prevSkin(4)end}, + WIDGET.newButton{name='prev5', x=690,y=220,w=80,h=65,sound='hold',font=40,fText="↑",code=function()_prevSkin(5)end}, + WIDGET.newButton{name='prev6', x=830,y=220,w=80,h=65,sound='hold',font=40,fText="↑",code=function()_prevSkin(6)end}, + WIDGET.newButton{name='prev7', x=970,y=220,w=80,h=65,sound='hold',font=40,fText="↑",code=function()_prevSkin(7)end}, - WIDGET.newButton{name='next1', x=130,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(1)end}, - WIDGET.newButton{name='next2', x=270,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(2)end}, - WIDGET.newButton{name='next3', x=410,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(3)end}, - WIDGET.newButton{name='next4', x=550,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(4)end}, - WIDGET.newButton{name='next5', x=690,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(5)end}, - WIDGET.newButton{name='next6', x=830,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(6)end}, - WIDGET.newButton{name='next7', x=970,y=440,w=80,h=65,fText="↓",code=function()_nextSkin(7)end}, + WIDGET.newButton{name='next1', x=130,y=440,w=80,h=65,sound='hold',font=40,fText="↓",code=function()_nextSkin(1)end}, + WIDGET.newButton{name='next2', x=270,y=440,w=80,h=65,sound='hold',font=40,fText="↓",code=function()_nextSkin(2)end}, + WIDGET.newButton{name='next3', x=410,y=440,w=80,h=65,sound='hold',font=40,fText="↓",code=function()_nextSkin(3)end}, + WIDGET.newButton{name='next4', x=550,y=440,w=80,h=65,sound='hold',font=40,fText="↓",code=function()_nextSkin(4)end}, + WIDGET.newButton{name='next5', x=690,y=440,w=80,h=65,sound='hold',font=40,fText="↓",code=function()_nextSkin(5)end}, + WIDGET.newButton{name='next6', x=830,y=440,w=80,h=65,sound='hold',font=40,fText="↓",code=function()_nextSkin(6)end}, + WIDGET.newButton{name='next7', x=970,y=440,w=80,h=65,sound='hold',font=40,fText="↓",code=function()_nextSkin(7)end}, - WIDGET.newButton{name='spin1', x=130,y=540,w=80,h=65,code=function()_nextDir(1)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name='spin2', x=270,y=540,w=80,h=65,code=function()_nextDir(2)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name='spin3', x=410,y=540,w=80,h=65,code=function()_nextDir(3)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name='spin4', x=550,y=540,w=80,h=65,code=function()_nextDir(4)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name='spin5', x=690,y=540,w=80,h=65,code=function()_nextDir(5)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name='spin6', x=825,y=540,w=80,h=65,code=function()_nextDir(6)end,font=50,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name='spin7', x=970,y=540,w=80,h=65,code=function()_nextDir(7)end,font=50,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin1', x=130,y=540,w=80,h=65,sound='rotate',font=40,code=function()_nextDir(1)end,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin2', x=270,y=540,w=80,h=65,sound='rotate',font=40,code=function()_nextDir(2)end,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin3', x=410,y=540,w=80,h=65,sound='rotate',font=40,code=function()_nextDir(3)end,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin4', x=550,y=540,w=80,h=65,sound='rotate',font=40,code=function()_nextDir(4)end,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin5', x=690,y=540,w=80,h=65,sound='rotate',font=40,code=function()_nextDir(5)end,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin6', x=825,y=540,w=80,h=65,sound='rotate',font=40,code=function()_nextDir(6)end,fText=CHAR.icon.retry_spin}, + WIDGET.newButton{name='spin7', x=970,y=540,w=80,h=65,sound='rotate',font=40,code=function()_nextDir(7)end,fText=CHAR.icon.retry_spin}, - WIDGET.newButton{name='skinR', x=200,y=640,w=220,h=80,color='lV',font=35, + WIDGET.newButton{name='skinR', x=200,y=640,w=220,h=80,color='lV',font=35,sound='back', code=function() SETTING.skin={1,7,11,3,14,4,9,1,7,2,6,10,2,13,5,9,15,10,11,3,10,2,16,8,4,10,13,2,8} SFX.play('rotate') end}, - WIDGET.newButton{name='faceR', x=480,y=640,w=220,h=80,color='lR',font=35, + WIDGET.newButton{name='faceR', x=480,y=640,w=220,h=80,color='lR',font=35,sound='back', code=function() for i=1,29 do SETTING.face[i]=0