优化重开的操作提示和显示

This commit is contained in:
MrZ626
2020-09-09 11:49:59 +08:00
parent b387cdc72d
commit a8130ebbe9
5 changed files with 17 additions and 12 deletions

View File

@@ -2,8 +2,9 @@ local langList={
{ {
anykey="按任意键继续", anykey="按任意键继续",
newVersion="检测到更新!", newVersion="检测到更新!",
newBigVersion="检测到大更新!大量存档信息已修改",
marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效",
holdR="请长按R键重新开始",
lang="中文", lang="中文",
atkModeName={"随机","徽章","击杀","反击"}, atkModeName={"随机","徽章","击杀","反击"},
royale_remain=function(n)return"剩余 "..n.." 名玩家"end, royale_remain=function(n)return"剩余 "..n.." 名玩家"end,
@@ -500,8 +501,9 @@ local langList={
{ {
anykey="按任意键继续", anykey="按任意键继续",
newVersion="检测到更新!", newVersion="检测到更新!",
newBigVersion="检测到大更新!大量存档信息已修改",
marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效",
holdR="请长按R键重新开始",
lang="全中文", lang="全中文",
atkModeName={"随机","徽章","击杀","反击"}, atkModeName={"随机","徽章","击杀","反击"},
royale_remain=function(n)return"剩余 "..n.." 名玩家"end, royale_remain=function(n)return"剩余 "..n.." 名玩家"end,
@@ -994,8 +996,9 @@ local langList={
{ {
anykey="Press any button", anykey="Press any button",
newVersion="Update detected!", newVersion="Update detected!",
newBigVersion="A big update was detected! Save data has been altered.",
marking="Game Author: MrZ_26\nIllegal recording if you can see this\nAny explanation is invalid", marking="Game Author: MrZ_26\nIllegal recording if you can see this\nAny explanation is invalid",
holdR="Hold R key to restart",
lang="English", lang="English",
atkModeName={"Random","Badges","K.O.s","Attackers"}, atkModeName={"Random","Badges","K.O.s","Attackers"},
royale_remain=function(n)return n.." Players Remaining"end, royale_remain=function(n)return n.." Players Remaining"end,
@@ -1478,8 +1481,9 @@ local langList={
{ {
anykey="↓□↓", anykey="↓□↓",
newVersion="&!!!", newVersion="&!!!",
newBigVersion="&!!!~~~",
marking="Game Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid", marking="Game Author:MrZ_26\nIllegal recording if see this\nAny explanation invalid",
holdR="→→→→R",
lang="?????", lang="?????",
atkModeName={"?","( )","!","←→"}, atkModeName={"?","( )","!","←→"},
royale_remain=function(n)return n.."~"end, royale_remain=function(n)return n.."~"end,
@@ -1960,8 +1964,9 @@ local langList={
{ {
anykey="您开始了", anykey="您开始了",
newVersion="感谢更新!", newVersion="感谢更新!",
newBigVersion="检测到大更新!大量存档信息已修改",
marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效", marking="游戏作者:MrZ_26\n任何视频/直播不得出现此水印\n任何转述声明无效",
holdR="长按重开",
lang="就这", lang="就这",
atkModeName={"随机","徽章","击杀","反击"}, atkModeName={"随机","徽章","击杀","反击"},
royale_remain=function(n)return""..n..""end, royale_remain=function(n)return""..n..""end,

View File

@@ -61,7 +61,7 @@ function LOG.print(text,T,C)--type/time,color
his=true his=true
elseif T=="short"then elseif T=="short"then
C=C or color.orange C=C or color.orange
time=30 time=20
elseif not C then elseif not C then
C=color.white C=color.white
end end

View File

@@ -58,7 +58,6 @@ if setting.lang==1 or setting.lang==2 then
"少女祈祷中", "少女祈祷中",
"扫雷好玩!", "扫雷好玩!",
"请不要向对方块不感兴趣的路人推荐此游戏。", "请不要向对方块不感兴趣的路人推荐此游戏。",
"你可以长按R键重新开始游戏(也不是很长)",
"你可以从统计页面打开游戏存档目录", "你可以从统计页面打开游戏存档目录",
"魔方好玩!", "魔方好玩!",
"喵!", "喵!",
@@ -152,7 +151,6 @@ elseif setting.lang==3 then
"l-=-1", "l-=-1",
"Is B2B2B2B possible?", "Is B2B2B2B possible?",
"Initial Rotation etc. can save your life", "Initial Rotation etc. can save your life",
"Hold R key to restart game",
"Hello world!", "Hello world!",
"Headphones for better experience", "Headphones for better experience",
"Have you noticed what does \"rotating\" do to block?", "Have you noticed what does \"rotating\" do to block?",

View File

@@ -2734,6 +2734,8 @@ function player.act.restart(P)
if game.frame<240 or game.result then if game.frame<240 or game.result then
TASK.removeTask_code(TICK.autoPause) TASK.removeTask_code(TICK.autoPause)
resetPartGameData() resetPartGameData()
else
LOG.print(text.holdR,"short")
end end
end end
function player.act.insLeft(P,auto) function player.act.insLeft(P,auto)

View File

@@ -1932,10 +1932,6 @@ do--play
--Warning --Warning
gc.push("transform") gc.push("transform")
gc.origin() gc.origin()
if restartCount>0 then
gc.setColor(0,0,0,restartCount*.05)
gc.rectangle("fill",0,0,scr.w,scr.h)
end
if game.warnLVL>0 then if game.warnLVL>0 then
gc.setColor(0,0,0,0) gc.setColor(0,0,0,0)
SHADER.warning:send("level",game.warnLVL) SHADER.warning:send("level",game.warnLVL)
@@ -1943,6 +1939,10 @@ do--play
gc.rectangle("fill",0,0,scr.w,scr.h) gc.rectangle("fill",0,0,scr.w,scr.h)
gc.setShader() gc.setShader()
end end
if restartCount>0 then
gc.setColor(0,0,0,restartCount*.05)
gc.rectangle("fill",0,0,scr.w,scr.h)
end
gc.pop() gc.pop()
end end
end end