diff --git a/parts/gameTables.lua b/parts/gameTables.lua index 3a37f885..96ea46de 100644 --- a/parts/gameTables.lua +++ b/parts/gameTables.lua @@ -330,11 +330,11 @@ eventSetList={ 'ultra', } rankColor={ - {.6,.3,.3}, - {.7,.5,.3}, - {.9,.7,.5}, - {.6,.9,1}, + {.5,.7,.9}, + {.5,1,.6}, {.95,.95,.5}, + {1,.5,.4}, + {.95,.5,.95}, } minoColor={ COLOR.R,COLOR.F,COLOR.O,COLOR.Y,COLOR.L,COLOR.J,COLOR.G,COLOR.A, diff --git a/parts/language/lang_en.lua b/parts/language/lang_en.lua index 7d642c03..fca918a9 100644 --- a/parts/language/lang_en.lua +++ b/parts/language/lang_en.lua @@ -61,7 +61,7 @@ return{ ai_prebag="AI is incompatible with custom sequences which have non-tetromino", ai_mission="AI is incompatible with custom missions", switchSpawnSFX="Please turn on the block spawn SFX!", - ranks={"D","C","B","A","S"}, + ranks={"B","A","S","U","X"}, needRestart="Restart to apply all changes", saveDone="Data saved", diff --git a/parts/language/lang_zh.lua b/parts/language/lang_zh.lua index b09088bd..2c1726ff 100644 --- a/parts/language/lang_zh.lua +++ b/parts/language/lang_zh.lua @@ -61,7 +61,7 @@ return{ ai_prebag="不能同时开启AI和含有非四连块的自定义序列", ai_mission="不能同时开启AI和自定义任务", switchSpawnSFX="请开启方块出生音效", - ranks={"D","C","B","A","S"}, + ranks={"B","A","S","U","X"}, needRestart="重新开始以生效", saveDone="保存成功!", diff --git a/parts/language/lang_zh2.lua b/parts/language/lang_zh2.lua index 5bf1f43e..efc3d8f3 100644 --- a/parts/language/lang_zh2.lua +++ b/parts/language/lang_zh2.lua @@ -26,7 +26,7 @@ return{ ai_prebag="不能同时开启电脑玩家和含有非四连块的自定义序列", ai_mission="不能同时开启电脑玩家和自定义任务", - ranks={"差","可","中","良","优"}, + ranks={"可","中","良","优","极"}, modInstruction="选择你要使用的模组!\n不同的模组会用不同的方式改变游戏规则,来开发新玩法挑战自我吧!\n提醒:开启一些模组会让成绩无效 你可以用键盘开关模组,按tab重置", modInfo={ diff --git a/parts/language/lang_zh3.lua b/parts/language/lang_zh3.lua index a47bfe9f..0e00e003 100644 --- a/parts/language/lang_zh3.lua +++ b/parts/language/lang_zh3.lua @@ -62,7 +62,7 @@ return{ ai_prebag="AI与具有非四格拼板的自定义序列不兼容", ai_mission="AI与自定义使命不兼容", switchSpawnSFX="请打开繁殖特技效果", - ranks={"D","C","B","A","S"}, + ranks={"B","A","S","U","X"}, needRestart="请重试以使更改生效", saveDone="保存的数据", diff --git a/parts/scenes/load.lua b/parts/scenes/load.lua index 1067884b..3da32630 100644 --- a/parts/scenes/load.lua +++ b/parts/scenes/load.lua @@ -28,11 +28,11 @@ local loadingThread=coroutine.wrap(function() YIELD('loadModeIcon') local modeIcons={} - modeIcons.marathon=GC.DO{32,32, + modeIcons.marathon=GC.DO{64,64, {'move',3,1}, - {'fRect',10,4,-2,23}, - {'fPoly',10,4,24,10,10,16.5}, - {'fRect',4,24,10,3}, + {'fRect',20,8,-4,46}, + {'fPoly',20,6,48,20,20,33}, + {'fRect',8,48,20,6}, } modeIcons.infinite=GC.DO{64,64, {'setLW',4}, diff --git a/parts/scenes/mode.lua b/parts/scenes/mode.lua index 9c40fbe8..f3ac6179 100644 --- a/parts/scenes/mode.lua +++ b/parts/scenes/mode.lua @@ -200,14 +200,14 @@ function scene.update() end end ---noRank/D/C/B/A/S +--noRank/B/A/S/U/X local baseRankColor={ [0]={0,0,0,.3}, - {.4,.1,.1,.3}, - {.4,.35,.3,.3}, - {.6,.4,.2,.3}, - {.7,.75,.85,.3}, + {.2,.4,.6,.3}, + {.6,.85,.65,.3}, {.85,.8,.3,.3}, + {.85,.5,.4,.3}, + {.85,.3,.8,.3}, } local rankColor=rankColor local function _drawModeShape(M,S,drawType)