diff --git a/Zframework/color.lua b/Zframework/color.lua index 94a0c4d6..1ff886c4 100644 --- a/Zframework/color.lua +++ b/Zframework/color.lua @@ -16,62 +16,62 @@ end local COLOR={ hsv=hsv, - red= {hsv(0, .85,.85)}, - fire= {hsv(0.0625,.85,.85)}, - orange= {hsv(0.125, .85,.85)}, - yellow= {hsv(0.1875,.85,.85)}, - lime= {hsv(0.25, .85,.85)}, - jade= {hsv(0.3125,.85,.85)}, - green= {hsv(0.375, .85,.85)}, - aqua= {hsv(0.4375,.85,.85)}, - cyan= {hsv(0.5, .85,.85)}, - navy= {hsv(0.5625,.85,.85)}, - sea= {hsv(0.625, .85,.85)}, - blue= {hsv(0.6875,.85,.85)}, - violet= {hsv(0.75, .85,.85)}, - purple= {hsv(0.8125,.85,.85)}, - magenta= {hsv(0.875, .85,.85)}, - wine= {hsv(0.9375,.85,.85)}, + red= {hsv(0.00, 0.89, 0.91)}, + fire= {hsv(0.04, 0.93, 0.94)}, + orange= {hsv(0.09, 0.99, 0.96)}, + yellow= {hsv(0.16, 0.82, 0.90)}, + lime= {hsv(0.18, 0.89, 0.88)}, + jade= {hsv(0.23, 1.00, 0.82)}, + green= {hsv(0.33, 1.00, 0.81)}, + aqua= {hsv(0.48, 1.00, 0.74)}, + cyan= {hsv(0.53, 1.00, 0.88)}, + navy= {hsv(0.56, 1.00, 1.00)}, + sea= {hsv(0.61, 1.00, 1.00)}, + blue= {hsv(0.64, 1.00, 0.95)}, + violet= {hsv(0.73, 1.00, 0.91)}, + purple= {hsv(0.80, 1.00, 0.81)}, + magenta= {hsv(0.86, 1.00, 0.78)}, + wine= {hsv(0.99, 0.96, 0.91)}, - lRed= {hsv(0, .5,.95)}, - lFire= {hsv(0.0625,.5,.95)}, - lOrange= {hsv(0.125, .5,.95)}, - lYellow= {hsv(0.1875,.5,.95)}, - lLime= {hsv(0.25, .5,.95)}, - lJade= {hsv(0.3125,.5,.95)}, - lGreen= {hsv(0.375, .5,.95)}, - lAqua= {hsv(0.4375,.5,.95)}, - lCyan= {hsv(0.5, .5,.95)}, - lNavy= {hsv(0.5625,.5,.95)}, - lSea= {hsv(0.625, .5,.95)}, - lBlue= {hsv(0.6875,.5,.95)}, - lViolet= {hsv(0.75, .5,.95)}, - lPurple= {hsv(0.8125,.5,.95)}, - lMagenta={hsv(0.875, .5,.95)}, - lWine= {hsv(0.9375,.5,.95)}, + lRed= {hsv(0.00, 0.38, 0.93)}, + lFire= {hsv(0.04, 0.45, 0.91)}, + lOrange= {hsv(0.10, 0.53, 0.92)}, + lYellow= {hsv(0.15, 0.61, 0.95)}, + lLime= {hsv(0.19, 0.66, 0.92)}, + lJade= {hsv(0.24, 0.56, 0.90)}, + lGreen= {hsv(0.34, 0.49, 0.89)}, + lAqua= {hsv(0.49, 0.59, 0.85)}, + lCyan= {hsv(0.51, 0.77, 0.88)}, + lNavy= {hsv(0.54, 0.80, 0.95)}, + lSea= {hsv(0.56, 0.72, 0.97)}, + lBlue= {hsv(0.64, 0.44, 0.96)}, + lViolet= {hsv(0.73, 0.47, 0.95)}, + lPurple= {hsv(0.80, 0.62, 0.89)}, + lMagenta= {hsv(0.86, 0.61, 0.89)}, + lWine= {hsv(0.93, 0.57, 0.92)}, - dRed= {hsv(0, .9,.5)}, - dFire= {hsv(0.0625,.9,.5)}, - dOrange= {hsv(0.125, .9,.5)}, - dYellow= {hsv(0.1875,.9,.5)}, - dLime= {hsv(0.25, .9,.5)}, - dJade= {hsv(0.3125,.9,.5)}, - dGreen= {hsv(0.375, .9,.5)}, - dAqua= {hsv(0.4375,.9,.5)}, - dCyan= {hsv(0.5, .9,.5)}, - dNavy= {hsv(0.5625,.9,.5)}, - dSea= {hsv(0.625, .9,.5)}, - dBlue= {hsv(0.6875,.9,.5)}, - dViolet= {hsv(0.75, .9,.5)}, - dPurple= {hsv(0.8125,.9,.5)}, - dMagenta={hsv(0.875, .9,.5)}, - dWine= {hsv(0.9375,.9,.5)}, + dRed= {hsv(0.00, 0.98, 0.95)}, + dFire= {hsv(0.04, 1.00, 0.68)}, + dOrange= {hsv(0.07, 1.00, 0.78)}, + dYellow= {hsv(0.11, 1.00, 0.74)}, + dLime= {hsv(0.17, 1.00, 0.53)}, + dJade= {hsv(0.31, 1.00, 0.54)}, + dGreen= {hsv(0.33, 1.00, 0.53)}, + dAqua= {hsv(0.47, 1.00, 0.46)}, + dCyan= {hsv(0.50, 1.00, 0.60)}, + dNavy= {hsv(0.59, 1.00, 0.84)}, + dSea= {hsv(0.64, 1.00, 0.80)}, + dBlue= {hsv(0.67, 1.00, 0.67)}, + dViolet= {hsv(0.71, 1.00, 0.70)}, + dPurple= {hsv(0.76, 1.00, 0.63)}, + dMagenta= {hsv(0.87, 1.00, 0.56)}, + dWine= {hsv(0.92, 1.00, 0.56)}, - black= {hsv(0,0,.05)}, - dGray= {hsv(0,0,0.3)}, - gray= {hsv(0,0,0.6)}, - lGray= {hsv(0,0,0.8)}, - white= {hsv(0,0,.97)}, + black= {hsv(0.64, 0.14, 0.14)}, + dGray= {hsv(0.62, 0.15, 0.44)}, + gray= {hsv(0.62, 0.17, 0.65)}, + lGray= {hsv(0.62, 0.18, 0.86)}, + white= {hsv(0.61, 0.08, 0.99)}, } for k,v in next,{ R='red', F='fire', O='orange', Y='yellow', L='lime', J='jade', G='green', A='aqua', C='cyan', N='navy', S='sea', B='blue', V='violet', P='purple', M='magenta', W='wine', diff --git a/parts/fonts/monospaced.ttf b/parts/fonts/monospaced.ttf index 2825bf51..ca483ca8 100644 Binary files a/parts/fonts/monospaced.ttf and b/parts/fonts/monospaced.ttf differ diff --git a/parts/fonts/proportional.ttf b/parts/fonts/proportional.ttf index 5f1b1f06..f9c4d5a6 100644 Binary files a/parts/fonts/proportional.ttf and b/parts/fonts/proportional.ttf differ diff --git a/parts/scenes/lang.lua b/parts/scenes/lang.lua index 3cfd2c83..9bfc30e6 100644 --- a/parts/scenes/lang.lua +++ b/parts/scenes/lang.lua @@ -25,15 +25,16 @@ local function _setLang(lid) TEXT.show(langList[lid],640,360,100,'appear',.626) collectgarbage() end + scene.widgetList={ WIDGET.newButton{x=271,y=190,w=346,h=120,font=40, fText=langList.zh, color='O',code=function()_setLang('zh')end}, WIDGET.newButton{x=637,y=190,w=346,h=120,font=40, fText=langList.zh_trad, color='F',code=function()_setLang('zh_trad')end}, WIDGET.newButton{x=1003,y=190,w=346,h=120,font=40, fText=langList.zh_full, color='R',code=function()_setLang('zh_full')end}, - WIDGET.newButton{x=225,y=331,w=255,h=120,font=40, fText=langList.en, color='Y',code=function()_setLang('en')end}, - WIDGET.newButton{x=500,y=331,w=255,h=120,font=40, fText=langList.fr, color='L',code=function()_setLang('fr')end}, - WIDGET.newButton{x=775,y=331,w=255,h=120,font=40, fText=langList.es, color='J',code=function()_setLang('es')end}, - WIDGET.newButton{x=1050,y=331,w=255,h=120,font=40, fText=langList.pt, color='G',code=function()_setLang('pt')end}, + WIDGET.newButton{x=225,y=331,w=255,h=120,font=40, fText=langList.en, color='L',code=function()_setLang('en')end}, + WIDGET.newButton{x=500,y=331,w=255,h=120,font=40, fText=langList.fr, color='J',code=function()_setLang('fr')end}, + WIDGET.newButton{x=775,y=331,w=255,h=120,font=40, fText=langList.es, color='G',code=function()_setLang('es')end}, + WIDGET.newButton{x=1050,y=331,w=255,h=120,font=40, fText=langList.pt, color='dG',code=function()_setLang('pt')end}, WIDGET.newButton{x=271,y=472,w=346,h=120,font=45, fText=langList.zh_grass,color='N',code=function()_setLang('zh_grass')end}, WIDGET.newButton{x=637,y=472,w=346,h=120,font=45, fText=langList.zh_yygq, color='S',code=function()_setLang('zh_yygq')end},