diff --git a/parts/gameTables.lua b/parts/gameTables.lua index d6d050f7..29c492ff 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -614,6 +614,7 @@ do--Userdata tables menuPos='middle', fine=false, autoSave=false, + autoLogin=true, simpMode=false, sysCursor=true, locale='zh', diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 6d15fb61..674f84ca 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -327,6 +327,7 @@ return{ sysCursor="Use System Cursor", autoPause="Pause When Unfocused", swap="Key Combination (Change Atk Mode)", + autoLogin="Auto Login on Start", autoSave="Auto Save New Records", simpMode="Simplistic Mode", }, diff --git a/parts/language/lang_es.lua b/parts/language/lang_es.lua index 4dbfc233..717ce8d5 100644 --- a/parts/language/lang_es.lua +++ b/parts/language/lang_es.lua @@ -295,6 +295,7 @@ return{ -- sysCursor="Use system cursor", autoPause="Pausar cuando la ventana no está enfocada", swap="Combinación de Teclas (Cambiar Modo de Ataque)", + -- autoLogin="Auto Login on Start", autoSave="Autograbar Récords", simpMode="Modo Sencillo", }, diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index fa9e27f6..ceac1630 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -292,6 +292,7 @@ return{ -- sysCursor="Use system cursor", autoPause="Mettre en pause en cas de perte de focus", swap="Combinaison de touches (changer le mode d'attaque)", + -- autoLogin="Auto Login on Start", -- autoSave="Auto save new-best", -- simpMode="Simple mode", }, diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 718de450..d7aecd9b 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -317,6 +317,7 @@ return{ -- sysCursor="Use system cursor", autoPause="Pausar quando foco for perco", swap="Combinação de tecla(Mudar modo de atk)", + -- autoLogin="Auto Login on Start", -- autoSave="Auto save new-best", -- simpMode="Simple mode", }, diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 4c66e453..0d4fb928 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -208,6 +208,7 @@ return{ sysCursor="?→*", autoPause="A||", swap="=+=+=", + autoLogin="#Log in#", autoSave="!!!>%", simpMode=".", }, diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 4e8f45d7..1f553c6e 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -328,6 +328,7 @@ return{ sysCursor="使用系统光标", autoPause="失去焦点自动暂停", swap="组合键切换攻击模式", + autoLogin="启动时自动登录", autoSave="破纪录自动保存", simpMode="简洁模式", }, diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index a6df9787..dcc379c5 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -329,6 +329,7 @@ return{ sysCursor="使用系统游标", autoPause="心不在焉", swap="组合键(更改攻击模式)", + autoLogin="启动时自动登录", autoSave="自动保存新的最佳", simpMode="简单化风格", }, diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index ae5403f5..2422fb51 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -93,7 +93,9 @@ local loadingThread=coroutine.wrap(function() STAT.run=STAT.run+1 --Connect to server - NET.wsconn_app() + if SETTING.autoLogin then + NET.wsconn_app() + end SFX.play('enter',.8) SFX.play('welcome') diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index e5a8e3b5..6a4490e6 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -41,13 +41,14 @@ scene.widgetList={ WIDGET.newButton{name="key", x=640, y=220, w=320,h=80,color='lG',font=35,code=goScene'setting_key'}, WIDGET.newButton{name="touch", x=990, y=220, w=320,h=80,color='lB',font=35,code=goScene'setting_touch'}, WIDGET.newSlider{name="reTime", x=330, y=320, w=300,lim=180,unit=10,disp=SETval('reTime'),code=SETsto('reTime'),show=function(S)return(.5+S.disp()*.25).."s"end}, - WIDGET.newSelector{name="RS", x=300, y=420, w=300,color='S',list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'},disp=SETval('RS'),code=SETsto('RS')}, - WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, - WIDGET.newSelector{name="menuPos", x=980, y=320, w=300,color='O',list={'left','middle','right'},disp=SETval('menuPos'),code=SETsto('menuPos')}, - WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, lim=580,disp=SETval('sysCursor'),code=switchCursor}, - WIDGET.newSwitch{name="autoPause", x=1060, y=450, lim=580,disp=SETval('autoPause'),code=SETrev('autoPause')}, - WIDGET.newSwitch{name="swap", x=1060, y=510, lim=580,disp=SETval('swap'), code=SETrev('swap')}, - WIDGET.newSwitch{name="autoSave", x=600, y=800, lim=430,disp=SETval('autoSave'), code=SETrev('autoSave')}, + WIDGET.newSelector{name="RS", x=300, y=420, w=300,color='S',disp=SETval('RS'), code=SETsto('RS'),list={'TRS','SRS','SRS_plus','SRS_X','BiRS','ARS_Z','ASC','ASC_plus','C2','C2_sym','Classic','Classic_plus','None','None_plus'}}, + WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene'setting_skin'}, + WIDGET.newSelector{name="menuPos", x=980, y=320, w=300,color='O',disp=SETval('menuPos'), code=SETsto('menuPos'),list={'left','middle','right'}}, + WIDGET.newSwitch{name="sysCursor" ,x=1060, y=390, lim=580,disp=SETval('sysCursor'), code=switchCursor}, + WIDGET.newSwitch{name="autoPause", x=1060, y=450, lim=580,disp=SETval('autoPause'), code=SETrev('autoPause')}, + WIDGET.newSwitch{name="swap", x=1060, y=510, lim=580,disp=SETval('swap'), code=SETrev('swap')}, + WIDGET.newSwitch{name="autoLogin", x=950, y=600, lim=580,disp=SETval('autoLogin'), code=SETrev('autoLogin')}, + WIDGET.newSwitch{name="autoSave", x=600, y=800, lim=430,disp=SETval('autoSave'), code=SETrev('autoSave')}, WIDGET.newSwitch{name="simpMode", x=1060, y=800, lim=380,disp=SETval('simpMode'), code=function() SETTING.simpMode=not SETTING.simpMode