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

几个绘制对象整合进TEXTURE模块，调整问号样式，简洁主菜单使用更多图标

Browse Source
This commit is contained in:
MrZ626
2021-06-08 17:42:57 +08:00
parent 67aea3b5ce
commit bca0410e28
4 changed files with 67 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
parts/scenes/main.lua
View File

@@ -172,24 +172,8 @@ scene.widgetList={
WIDGET.newButton{name="manual", x=2480,y=570,w=800,h=100, color='lC',font=40,align='L',edge=30,code=pressKey","},
WIDGET.newButton{name="music", x=130,y=80,w=200,h=90, color='lO',font=35,code=pressKey"2"},
WIDGET.newButton{name="lang", x=300,y=80,w=90,h=90, color='lN',font=40,code=pressKey"3",
fText=DOGC{64,64,
{"setLW",4},
{"dCirc",32,32,30},
{"line",2,31,62,31},
{"line",31,2,31,62},
{"dArc",10,31,40,-.8,.8},
{"dArc",53,31,40,2.3,3.9},
}
},
WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',font=35,align='R',edge=30,code=pressKey"x",
fText=DOGC{50,50,
{'setLW',5},
{'dCirc',25,25,22},
{'fRect',22,11,6,6},
{'fRect',22,20,6,20},
}
},
WIDGET.newButton{name="lang", x=300,y=80,w=90,h=90, color='lN',font=40,code=pressKey"3",fText=TEXTURE.language},
WIDGET.newButton{name="about", x=-110,y=670,w=600,h=70, color='lB',font=35,align='R',edge=30,code=pressKey"x",fText=TEXTURE.info},
WIDGET.newButton{name="back", x=1390,y=670,w=600,h=70, color='lR',fText=TEXTURE.back,align='L',edge=30,code=backScene},
}

8
parts/scenes/main_simple.lua
View File

@@ -20,10 +20,10 @@ scene.widgetList={
WIDGET.newText{name="version", x=950,y=280,color='Z',align='L',fText=VERSION.string},
WIDGET.newButton{name="sprint", x=260,y=480,w=260,font=50,code=function()loadGame('sprint_40l',true)end},
WIDGET.newButton{name="marathon",x=640,y=480,w=260,font=50,code=function()loadGame('marathon_n',true)end},
WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText="...",font=50,code=goScene'setting_game'},
WIDGET.newButton{name="lang", x=1000,y=560,w=120,fText="言/A",font=40,code=goScene'lang'},
WIDGET.newButton{name="manual", x=1160,y=400,w=120,fText="?",font=80,code=goScene'manual'},
WIDGET.newButton{name="quit", x=1160,y=560,w=120,fText="X",font=70,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end},
WIDGET.newButton{name="setting",x=1000,y=400,w=120,fText=TEXTURE.setting,font=50,code=goScene'setting_game'},
WIDGET.newButton{name="lang", x=1000,y=560,w=120,fText=TEXTURE.language,font=40,code=goScene'lang'},
WIDGET.newButton{name="manual", x=1160,y=400,w=120,fText=TEXTURE.question,font=80,code=goScene'manual'},
WIDGET.newButton{name="quit", x=1160,y=560,w=120,fText=TEXTURE.quit,font=70,code=function()VOC.play('bye')SCN.swapTo('quit','slowFade')end},
}
return scene

2
parts/scenes/net_game.lua
View File

@@ -358,7 +358,7 @@ scene.widgetList={
NET.getlock('ready')
end},
WIDGET.newKey{name="hideChat",fText="...",x=380,y=35,w=60,font=35,code=_switchChat},
WIDGET.newKey{name="quit",fText="X",x=900,y=35,w=60,font=40,code=_quit},
WIDGET.newKey{name="quit",fText=TEXTURE.quit_small,x=900,y=35,w=60,font=40,code=_quit},
}
return scene

77
parts/texture.lua
View File

@@ -64,20 +64,6 @@ for i=0,9 do
}
end
--Setting icon
TEXTURE.setting=DOGC{64,64,
{"setLW",8},
{"dCirc",32,32,18},
{"setLW",10},
{"line",52,32,64,32},
{"line",32,52,32,64},
{"line",12,32,0,32},
{"line",32,12,32,0},
{"line",45,45,55,55},
{"line",19,45,9,55},
{"line",19,19,9,9},
{"line",45,19,55,9},
}
gc.setDefaultFilter('linear','linear')
@@ -126,9 +112,46 @@ for i=1,8 do
end
--Question mark
TEXTURE.question=DOGC{45,80,
{'setFT',100},
{'print',"?",0,-30},
TEXTURE.question=DOGC{48,64,
{'fRect',0,0,10,27},
{'fRect',0,0,48,10},
{'fRect',38,10,10,15},
{'fRect',19,25,29,9},
{'fRect',19,25,9,22},
{'fRect',18,53,11,11},
}
--Setting icon
TEXTURE.setting=DOGC{64,64,
{"setLW",8},
{"dCirc",32,32,18},
{"setLW",10},
{"line",52,32,64,32},
{"line",32,52,32,64},
{"line",12,32,0,32},
{"line",32,12,32,0},
{"line",45,45,55,55},
{"line",19,45,9,55},
{"line",19,19,9,9},
{"line",45,19,55,9},
}
--Language mark
TEXTURE.language=DOGC{64,64,
{"setLW",4},
{"dCirc",32,32,30},
{"line",2,31,62,31},
{"line",31,2,31,62},
{"dArc",10,31,40,-.8,.8},
{"dArc",53,31,40,2.3,3.9},
}
--Info. mark
TEXTURE.info=DOGC{50,50,
{'setLW',5},
{'dCirc',25,25,22},
{'fRect',22,11,6,6},
{'fRect',22,20,6,20},
}
--More mark
@@ -148,5 +171,25 @@ TEXTURE.back=DOGC{60,55,
{'line',20,50,10,40,20,30},
}
--Quit mark
TEXTURE.quit=DOGC{50,50,
{"setCL",1,1,1},
{"draw",DOGC{50,50,
{"setLW",7},
{"line",5,5,45,45},
{"line",5,45,45,5},
}}
}
--Quit mark (small)
TEXTURE.quit_small=DOGC{30,30,
{"setCL",1,1,1},
{"draw",DOGC{30,30,
{"setLW",4},
{"line",2,2,28,28},
{"line",2,28,28,2},
}}
}
gc.setCanvas()
return TEXTURE