diff --git a/Zframework/widget.lua b/Zframework/widget.lua index 7604636c..40c81cb0 100644 --- a/Zframework/widget.lua +++ b/Zframework/widget.lua @@ -58,20 +58,17 @@ function image:reset() end function image:draw() gc.setColor(1,1,1,self.alpha) - gc.draw(self.img,self.x,self.y,self.ang,self.kx,self.ky,self.ox,self.oy) + gc.draw(self.img,self.x,self.y,self.ang,self.k) end function WIDGET.newImage(D) local _={ name= D.name, - img= D.img, - alpha= D.alpha or 1, + img= D.img or D.name, + alpha= D.alpha, x= D.x, y= D.y, ang= D.ang, - kx= D.kx, - ky= D.ky, - ox= D.ox, - oy= D.oy, + k= D.k, hide= D.hide, } for k,v in next,image do _[k]=v end diff --git a/Zframework/widgetList.lua b/Zframework/widgetList.lua index 8fde438f..9bd105cd 100644 --- a/Zframework/widgetList.lua +++ b/Zframework/widgetList.lua @@ -634,11 +634,13 @@ local Widgets={ newButton({name="back", x=640, y=600,w=200,h=80,font=35,code=BACK}), }, help={ - newButton({name="dict", x=1140, y=410,w=220,h=70, font=35,code=goScene("dict")}), - newButton({name="staff", x=1140, y=490,w=220,h=70, font=35,code=goScene("staff")}), - newButton({name="his", x=1140, y=570,w=220,h=70, font=35,code=goScene("history")}), - newButton({name="qq", x=1140, y=650,w=220,h=70, font=35,code=function()love.system.openURL("tencent://message/?uin=1046101471&Site=&Menu=yes")end,hide=mobileHide}), - newButton({name="back", x=640, y=600,w=170,h=80, font=35,code=BACK}), + newImage({name="pay1", x=20, y=20}), + newImage({name="pay2", x=1014, y=20}), + newButton({name="dict", x=1140, y=410,w=220,h=70,font=35,code=goScene("dict")}), + newButton({name="staff", x=1140, y=490,w=220,h=70,font=35,code=goScene("staff")}), + newButton({name="his", x=1140, y=570,w=220,h=70,font=35,code=goScene("history")}), + newButton({name="qq", x=1140, y=650,w=220,h=70,font=35,code=function()love.system.openURL("tencent://message/?uin=1046101471&Site=&Menu=yes")end,hide=mobileHide}), + newButton({name="back", x=640, y=600,w=170,h=80,font=35,code=BACK}), }, dict={ newText({name="title", x=20,y=5,font=70,align="L"}), diff --git a/parts/scenes.lua b/parts/scenes.lua index acc22387..c8f47e3d 100644 --- a/parts/scenes.lua +++ b/parts/scenes.lua @@ -2476,8 +2476,6 @@ do--help gc.setLineWidth(3) gc.rectangle("line",18,18,263,263) gc.rectangle("line",1012,18,250,250) - gc.draw(IMG.pay1,20,20) - gc.draw(IMG.pay2,1014,20) setFont(20) mStr(text.group,640,490) gc.setColor(1,1,1,sin(Timer()*20)*.3+.6)