diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index f31c18c7..df35bfb1 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -274,6 +274,7 @@ return{ reTime="Start Delay", RS="Rotation System", layout="Layout", + dataSaving="Data saving", autoPause="Pause while unfocused", swap="Key Combination (Change Atk. Mode)", fine="Finesse Error SFX", diff --git a/parts/language/lang_fr.lua b/parts/language/lang_fr.lua index bb078e61..db778590 100644 --- a/parts/language/lang_fr.lua +++ b/parts/language/lang_fr.lua @@ -246,6 +246,7 @@ return{ reTime="Délai de démarrage", RS="Système de rotation", layout="Disposition", + -- dataSaving="Data saving", autoPause="Mettre en pause en cas de perte de focus", swap="Combinaison de touches (changer le mode d'attaque)", fine="Son d'erreur de Finesse", diff --git a/parts/language/lang_pt.lua b/parts/language/lang_pt.lua index 461e43d0..4e597f17 100644 --- a/parts/language/lang_pt.lua +++ b/parts/language/lang_pt.lua @@ -275,6 +275,7 @@ return{ reTime="Demora iniciação", RS="Sistema de rotação", layout="Layout", + -- dataSaving="Data saving", autoPause="Pausar quando foco for perco", swap="Combinação de tecla(Mudar modo de atk)", fine="Som Falha de destreza", diff --git a/parts/language/lang_sp.lua b/parts/language/lang_sp.lua index 5508e89b..e6a2ccce 100644 --- a/parts/language/lang_sp.lua +++ b/parts/language/lang_sp.lua @@ -252,6 +252,7 @@ return{ reTime="Retraso de Inicio", RS="Sistema de Rotación", layout="Diseño", + -- dataSaving="Data saving", autoPause="Pausar cuando la ventana no está enfocada", swap="Combinación de Teclas (Cambiar Modo de Ataque)", fine="Sonido de Error de Finesse", diff --git a/parts/language/lang_symbol.lua b/parts/language/lang_symbol.lua index 3d929bb4..7880922d 100644 --- a/parts/language/lang_symbol.lua +++ b/parts/language/lang_symbol.lua @@ -132,6 +132,7 @@ return{ reTime="3-2-1", RS="''?", layout="=-=-=", + dataSaving="XX.", autoPause="A||", swap="=+=+=", fine="12 X 21", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index 26d69b38..ed9be54f 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -274,6 +274,7 @@ return{ reTime="开局等待时间", RS="旋转系统", layout="外观", + dataSaving="省流模式", autoPause="失去焦点自动暂停", swap="组合键切换攻击模式", fine="极简操作提示音", diff --git a/parts/net.lua b/parts/net.lua index 80d5c7e1..18074ec8 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -144,7 +144,7 @@ function NET.getAccessToken() end end function NET.getUserInfo(uid) - local hash=not SETTING.dataSaving and USERS.getHash(uid) + local hash=(not SETTING.dataSaving or nil)and USERS.getHash(uid) WS.send("user",JSON.encode{ action=1, data={ diff --git a/parts/scenes/setting_game.lua b/parts/scenes/setting_game.lua index 1e915bf3..604cee60 100644 --- a/parts/scenes/setting_game.lua +++ b/parts/scenes/setting_game.lua @@ -13,9 +13,9 @@ function scene.draw() local t=TIME() local b=math.floor(t*2)%16+1 gc.setColor(1,1,1) - gc.draw(SKIN.curText[b],710,540,t%6.28319,2,nil,15,15) + gc.draw(SKIN.curText[b],410,540,t%6.2832,2,nil,15,15) gc.setColor(1,1,1,t*2%1) - gc.draw(SKIN.curText[b%16+1],710,540,t%6.28319,2,nil,15,15) + gc.draw(SKIN.curText[b%16+1],410,540,t%6.2832,2,nil,15,15) end scene.widgetList={ @@ -29,7 +29,8 @@ scene.widgetList={ 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=350, y=340, w=300,unit=10,disp=SETval("reTime"),code=SETsto("reTime"),show=function(S)return(.5+S.disp()*.25).."s"end}, WIDGET.newSelector{name="RS", x=500, y=420, w=300,color="S",list={"TRS","SRS","C2","C2sym","Classic","None"},disp=SETval("RS"),code=SETsto("RS")}, - WIDGET.newButton{name="layout", x=550, y=540, w=200,h=70,font=35, code=goScene"setting_skin"}, + WIDGET.newButton{name="layout", x=250, y=540, w=200,h=70,font=35, code=goScene"setting_skin"}, + WIDGET.newSwitch{name="dataSaving", x=750, y=550, font=20,disp=SETval("dataSaving"),code=SETrev("dataSaving")}, WIDGET.newSwitch{name="autoPause", x=1060, y=310, font=20,disp=SETval("autoPause"),code=SETrev("autoPause")}, WIDGET.newSwitch{name="swap", x=1060, y=370, font=20,disp=SETval("swap"), code=SETrev("swap")}, WIDGET.newSwitch{name="fine", x=1060, y=430, font=20,disp=SETval("fine"), code=function()SETTING.fine=not SETTING.fine if SETTING.fine then SFX.play("finesseError",.6) end end},