SweetSea/Techmino
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整颜色表

Browse Source 
调整语言选择菜单
整理代码
This commit is contained in:
MrZ626
2021-12-07 00:21:57 +08:00
parent a728c91476
commit 5570c19e1f
7 changed files with 37 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Zframework/color.lua
View File

@@ -19,11 +19,11 @@ local COLOR={
red= {hsv(0.00, 0.89, 0.91)}, red= {hsv(0.00, 0.89, 0.91)},
fire= {hsv(0.04, 0.93, 0.94)}, fire= {hsv(0.04, 0.93, 0.94)},
orange= {hsv(0.09, 0.99, 0.96)}, orange= {hsv(0.09, 0.99, 0.96)},
yellow= {hsv(0.16, 0.82, 0.90)}, yellow= {hsv(0.15, 0.82, 0.90)},
lime= {hsv(0.18, 0.89, 0.88)}, lime= {hsv(0.20, 0.89, 0.88)},
jade= {hsv(0.23, 1.00, 0.82)}, jade= {hsv(0.25, 1.00, 0.82)},
green= {hsv(0.33, 1.00, 0.81)}, green= {hsv(0.33, 1.00, 0.81)},
aqua= {hsv(0.48, 1.00, 0.74)}, aqua= {hsv(0.47, 1.00, 0.76)},
cyan= {hsv(0.53, 1.00, 0.88)}, cyan= {hsv(0.53, 1.00, 0.88)},
navy= {hsv(0.56, 1.00, 1.00)}, navy= {hsv(0.56, 1.00, 1.00)},
sea= {hsv(0.61, 1.00, 1.00)}, sea= {hsv(0.61, 1.00, 1.00)},
@@ -36,14 +36,14 @@ local COLOR={
lRed= {hsv(0.00, 0.38, 0.93)}, lRed= {hsv(0.00, 0.38, 0.93)},
lFire= {hsv(0.04, 0.45, 0.91)}, lFire= {hsv(0.04, 0.45, 0.91)},
lOrange= {hsv(0.10, 0.53, 0.92)}, lOrange= {hsv(0.10, 0.53, 0.92)},
lYellow= {hsv(0.15, 0.61, 0.95)}, lYellow= {hsv(0.14, 0.61, 0.95)},
lLime= {hsv(0.19, 0.66, 0.92)}, lLime= {hsv(0.20, 0.66, 0.92)},
lJade= {hsv(0.24, 0.56, 0.90)}, lJade= {hsv(0.26, 0.56, 0.90)},
lGreen= {hsv(0.34, 0.49, 0.89)}, lGreen= {hsv(0.34, 0.49, 0.89)},
lAqua= {hsv(0.49, 0.59, 0.85)}, lAqua= {hsv(0.47, 0.59, 0.86)},
lCyan= {hsv(0.51, 0.77, 0.88)}, lCyan= {hsv(0.51, 0.77, 0.88)},
lNavy= {hsv(0.54, 0.80, 0.95)}, lNavy= {hsv(0.54, 0.80, 0.95)},
lSea= {hsv(0.56, 0.72, 0.97)}, lSea= {hsv(0.57, 0.72, 0.97)},
lBlue= {hsv(0.64, 0.44, 0.96)}, lBlue= {hsv(0.64, 0.44, 0.96)},
lViolet= {hsv(0.72, 0.47, 0.95)}, lViolet= {hsv(0.72, 0.47, 0.95)},
lPurple= {hsv(0.80, 0.62, 0.89)}, lPurple= {hsv(0.80, 0.62, 0.89)},
@@ -53,13 +53,13 @@ local COLOR={
dRed= {hsv(0.00, 0.80, 0.48)}, dRed= {hsv(0.00, 0.80, 0.48)},
dFire= {hsv(0.04, 0.80, 0.34)}, dFire= {hsv(0.04, 0.80, 0.34)},
dOrange= {hsv(0.07, 0.80, 0.39)}, dOrange= {hsv(0.07, 0.80, 0.39)},
dYellow= {hsv(0.11, 0.80, 0.37)}, dYellow= {hsv(0.12, 0.80, 0.37)},
dLime= {hsv(0.17, 0.80, 0.26)}, dLime= {hsv(0.20, 0.80, 0.26)},
dJade= {hsv(0.31, 0.80, 0.27)}, dJade= {hsv(0.29, 0.80, 0.27)},
dGreen= {hsv(0.33, 0.80, 0.26)}, dGreen= {hsv(0.33, 0.80, 0.26)},
dAqua= {hsv(0.47, 0.80, 0.23)}, dAqua= {hsv(0.46, 0.80, 0.24)},
dCyan= {hsv(0.50, 0.80, 0.30)}, dCyan= {hsv(0.50, 0.80, 0.30)},
dNavy= {hsv(0.59, 0.80, 0.42)}, dNavy= {hsv(0.58, 0.80, 0.42)},
dSea= {hsv(0.64, 0.80, 0.40)}, dSea= {hsv(0.64, 0.80, 0.40)},
dBlue= {hsv(0.67, 0.80, 0.34)}, dBlue= {hsv(0.67, 0.80, 0.34)},
dViolet= {hsv(0.71, 0.80, 0.35)}, dViolet= {hsv(0.71, 0.80, 0.35)},

2
main.lua
View File

@@ -346,7 +346,7 @@ LANG.init('zh',
fr=require'parts.language.lang_fr', fr=require'parts.language.lang_fr',
es=require'parts.language.lang_es', es=require'parts.language.lang_es',
pt=require'parts.language.lang_pt', pt=require'parts.language.lang_pt',
id=require'parts.language.lang_id', id=require'parts.language.lang_id',
zh_grass=require'parts.language.lang_zh_grass', zh_grass=require'parts.language.lang_zh_grass',
zh_yygq=require'parts.language.lang_yygq', zh_yygq=require'parts.language.lang_yygq',
symbol=require'parts.language.lang_symbol', symbol=require'parts.language.lang_symbol',

4
parts/eventsets/big_h.lua
View File

@@ -9,7 +9,7 @@ return
PLY.draw.drawTargetLine(P,200-P.stat.row) PLY.draw.drawTargetLine(P,200-P.stat.row)
end, end,
task=function(P) task=function(P)
local F=P.field local F=P.field
for i=1,24 do for i=1,24 do
F[i]=LINE.new(20) F[i]=LINE.new(20)
P.visTime[i]=LINE.new(20) P.visTime[i]=LINE.new(20)
@@ -31,7 +31,7 @@ return
P:set20G(true) P:set20G(true)
P.modeData.target=200 P.modeData.target=200
SFX.play('reach') SFX.play('reach')
else else
P:win('finish') P:win('finish')
end end
end end

2
parts/eventsets/big_n.lua
View File

@@ -11,7 +11,7 @@ return
PLY.draw.drawTargetLine(P,200-P.stat.row) PLY.draw.drawTargetLine(P,200-P.stat.row)
end, end,
task=function(P) task=function(P)
local F=P.field local F=P.field
for i=1,24 do for i=1,24 do
F[i]=LINE.new(20) F[i]=LINE.new(20)
P.visTime[i]=LINE.new(20) P.visTime[i]=LINE.new(20)

2
parts/modes/big_h.lua
View File

@@ -4,7 +4,7 @@ return{
mindas=7,minarr=1,minsdarr=1, mindas=7,minarr=1,minsdarr=1,
sequence="bagES", sequence="bagES",
hook_drop=require'parts.eventsets.bigWallGen'.hook_drop, hook_drop=require'parts.eventsets.bigWallGen'.hook_drop,
eventSet='big_h', eventSet='big_h',
bg='cubes',bgm='push', bg='cubes',bgm='push',
}, },
score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end, score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,

2
parts/modes/big_n.lua
View File

@@ -4,7 +4,7 @@ return{
mindas=7,minarr=1,minsdarr=1, mindas=7,minarr=1,minsdarr=1,
sequence="bagES", sequence="bagES",
hook_drop=require'parts.eventsets.bigWallGen'.hook_drop, hook_drop=require'parts.eventsets.bigWallGen'.hook_drop,
eventSet='big_n', eventSet='big_n',
bg='bg2',bgm='push', bg='bg2',bgm='push',
}, },
score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end, score=function(P)return{math.min(P.modeData.maxCombo,100),P.stat.time}end,

42
parts/scenes/lang.lua
View File

@@ -6,24 +6,16 @@ local langList={
fr="Français", fr="Français",
es="　Español\n(Castellano)", es="　Español\n(Castellano)",
pt="Português", pt="Português",
id="Indonesia", id="Bahasa",
zh_grass="机翻", zh_grass="机翻",
zh_yygq="就这?", zh_yygq="就这?",
symbol="?????", symbol="?????",
} }
local languages={ local languages={
"Language", "Language Langue Lingua",
"语言", "语言 言語 언어",
"言語", "Idioma Línguas Sprache",
"Langue", "Язык Γλώσσα Bahasa",
"Idioma",
"Línguas",
"Sprache",
"Lingua",
"Язык",
"Γλώσσα",
"언어",
"Bahasa",
} }
local curLang=1 local curLang=1
@@ -34,7 +26,7 @@ function scene.sceneBack()
end end
function scene.update(dt) function scene.update(dt)
curLang=curLang+dt*1.626 curLang=curLang+dt*1.26
if curLang>=#languages+1 then if curLang>=#languages+1 then
curLang=1 curLang=1
end end
@@ -58,19 +50,19 @@ local function _setLang(lid)
end end
scene.widgetList={ scene.widgetList={
WIDGET.newButton{x=271,y=210,w=346,h=100,font=42, fText=langList.en, color='R',code=function()_setLang('en')end}, WIDGET.newButton{x=271,y=210,w=346,h=100,font=40, fText=langList.en, color='R',code=function()_setLang('en')end},
WIDGET.newButton{x=271,y=329,w=346,h=100,font=42, fText=langList.fr, color='F',code=function()_setLang('fr')end}, WIDGET.newButton{x=271,y=329,w=346,h=100,font=40, fText=langList.fr, color='F',code=function()_setLang('fr')end},
WIDGET.newButton{x=271,y=449,w=346,h=100,font=42, fText=langList.es, color='O',code=function()_setLang('es')end}, WIDGET.newButton{x=271,y=449,w=346,h=100,font=35, fText=langList.es, color='O',code=function()_setLang('es')end},
WIDGET.newButton{x=271,y=568,w=346,h=100,font=42, fText=langList.id, color='lO',code=function()_setLang('id')end}, WIDGET.newButton{x=271,y=568,w=346,h=100,font=40, fText=langList.id, color='Y',code=function()_setLang('id')end},
WIDGET.newButton{x=637,y=210,w=346,h=100,font=40, fText=langList.pt, color='G',code=function()_setLang('pt')end}, WIDGET.newButton{x=637,y=210,w=346,h=100,font=40, fText=langList.pt, color='A',code=function()_setLang('pt')end},
WIDGET.newButton{x=637,y=329,w=346,h=100,font=40, fText=langList.symbol, color='J',code=function()_setLang('symbol')end}, WIDGET.newButton{x=637,y=329,w=346,h=100,font=40, fText=langList.symbol, color='G',code=function()_setLang('symbol')end},
WIDGET.newButton{x=637,y=449,w=346,h=100,font=40, fText=langList.zh_yygq, color='L',code=function()_setLang('zh_yygq')end}, WIDGET.newButton{x=637,y=449,w=346,h=100,font=40, fText=langList.zh_yygq, color='J',code=function()_setLang('zh_yygq')end},
WIDGET.newButton{x=637,y=568,w=346,h=100,font=40, fText=langList.zh_grass,color='Y',code=function()_setLang('zh_grass')end}, WIDGET.newButton{x=637,y=568,w=346,h=100,font=40, fText=langList.zh_grass,color='L',code=function()_setLang('zh_grass')end},
WIDGET.newButton{x=1003,y=210,w=346,h=100,font=40,fText=langList.zh, color='B',code=function()_setLang('zh')end}, WIDGET.newButton{x=1003,y=210,w=346,h=100,font=40,fText=langList.zh, color='C',code=function()_setLang('zh')end},
WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_full, color='S',code=function()_setLang('zh_full')end}, WIDGET.newButton{x=1003,y=329,w=346,h=100,font=40,fText=langList.zh_full, color='N',code=function()_setLang('zh_full')end},
WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='N',code=function()_setLang('zh_trad')end}, WIDGET.newButton{x=1003,y=449,w=346,h=100,font=40,fText=langList.zh_trad, color='S',code=function()_setLang('zh_trad')end},
WIDGET.newButton{name='back',x=1003,y=568,w=346,h=100,font=60,fText=CHAR.icon.back,code=backScene}, WIDGET.newButton{name='back',x=1003,y=568,w=346,h=100,font=60,fText=CHAR.icon.back,code=backScene},
} }