xitonglai

2021-12-07 16:57:47 +08:00
parent 4806af5f7d
commit 7b41551e2d
15 changed files with 52 additions and 38 deletions
--- a/main.lua
+++ b/main.lua
@@ -24,7 +24,7 @@ VERSION=require"version"
 TIME=love.timer.getTime
 YIELD=coroutine.yield
 SYSTEM=love.system.getOS()if SYSTEM=='OS X'then SYSTEM='macOS'end
-FNSF=SYSTEM:find'\79\83'--What does FNSF stand for? IDK so don't ask me lol
+FNNS=SYSTEM:find'\79\83'--What does FNSF stand for? IDK so don't ask me lol
 MOBILE=SYSTEM=='Android'or SYSTEM=='iOS'
 SAVEDIR=fs.getSaveDirectory()

--- a/parts/language/dict_en.lua
+++ b/parts/language/dict_en.lua
@@ -80,11 +80,22 @@ return{
        "Google \"Tetris Online Poland\" for the Poland server.\nClick on the globe icon for information about the Tetris Online Study server.",
        "http://teatube.ltd/tos",
    },
-    {"P\97\116\114\101\111\110",
-        "p\97\116\114\101\111\110 support",
+    {"Support 1",
+        "support wechat vx alipay zfb",
        "org",
-        "Techmino's P\97\116\114\101\111\110 Page",
-        FNSF and"https://www.youtube.com/watch?v=DVl0IiUKX_g"or"https://www.p\97\116\114\101\111\110.com/techmino",
+        "vx/zfb-console-support",
+    },
+    {"Support 2",
+        "support afdian",
+        "org",
+        "Afdian",
+        FNNS and"https://www.bilibili.com/video/BV1GJ411x7h7"or"https://afdian.net/@MrZ_26",
+    },
+    {"Support 3",
+        "support p\97\116\114\101\111\110",
+        "org",
+        "P\97\116\114\101\111\110",
+        FNNS and"https://www.bilibili.com/video/BV1GJ411x7h7"or"https://www.p\97\116\114\101\111\110.com/techmino",
    },
    --Games
    {"TTT",
--- a/parts/language/dict_zh.lua
+++ b/parts/language/dict_zh.lua
@@ -73,11 +73,22 @@ return{
        "TO-S的添加方法、说明等关于茶服的一切",
        "http://teatube.ltd/tos",
    },
-    {"P\97\116\114\101\111\110",
-        "赞助 p\97\116\114\101\111\110 support zanzhu daqian",
+    {"赞助1",
+        "赞助 support weixin vx zhifubao zfb zanzhu daqian qia",
        "org",
-        "Techmino的P\97\116\114\101\111\110",
-        FNSF and"https://www.youtube.com/watch?v=DVl0IiUKX_g"or"https://www.p\97\116\114\101\111\110.com/techmino",
+        "vx/zfb-控制台-support",
+    },
+    {"赞助2",
+        "赞助 support aifadian afdian zanzhu daqian qia",
+        "org",
+        "Afdian",
+        FNNS and"https://www.bilibili.com/video/BV1GJ411x7h7"or"https://afdian.net/@MrZ_26",
+    },
+    {"赞助3",
+        "赞助 support zanzhu daqian qia",
+        "org",
+        "P\97\116\114\101\111\110",
+        FNNS and"https://www.bilibili.com/video/BV1GJ411x7h7"or"https://www.p\97\116\114\101\111\110.com/techmino",
    },

    --游戏（题库）
--- a/parts/language/lang_en.lua
+++ b/parts/language/lang_en.lua
@@ -206,9 +206,8 @@ return{
        "Make sure to get the game only from official sources,",
        "as we can't make sure you're safe if you got it elsewhere.",
        "The author is not responsible for any modifications.",
-        FNSF and"/"or"While the game is free, donations are appreciated.",
-        FNSF and"/"or"If you are unable to use both WeChat Pay and AliPay,",
-        FNSF and"/"or"you can go to our P\97\116\114\101\111\110 page (Link in Zictionary) to support us!",
+        FNNS and"/"or"While the game is free, donations are appreciated.",
+        FNNS and"/"or"Check Zictionary for more",
    },
    staff={
        "Author: MrZ  Email: 1046101471@qq.com",
--- a/parts/language/lang_es.lua
+++ b/parts/language/lang_es.lua
@@ -172,9 +172,8 @@ return{
        "Descarga disponible únicamente vía el grupo de testeo y discord.gg/f9pUvkh",
        "Descargas desde otros sitios pueden contener malware/viruses, y en smartphones sólo requiere permisos de internet y vibración.",
        "El autor no se responabiliza por daños ocasionados debido a modificaciones del juego.",
-        FNSF and"/"or"Por favor descarga las últimas versiones desde los sitios oficiales. El juego es gratuito",
-        FNSF and"/"or"Si no puede usar WeChat Pay y AliPay,",
-        FNSF and"/"or"puede ir a nuestra página de P\97\116\114\101\111\110 para apoyarnos.",
+        FNNS and"/"or"Por favor descarga las últimas versiones desde los sitios oficiales. El juego es gratuito",
+        -- FNNS and"/"or"Check Zictionary for more",
    },
    staff={
        "Autor:MrZ  Email: 1046101471@qq.com",
--- a/parts/language/lang_fr.lua
+++ b/parts/language/lang_fr.lua
@@ -172,9 +172,8 @@ return{
        "Ce jeu est gratuit et est uniquement disponible via discord.gg/f9pUvkh",
        "Ne téléchargez pas ce jeu depuis une autre source au risque d'avoir des virus,",
        "et vous n'avez besoin que des permissions de vibration et de communication réseau pour les versions mobiles !",
-        FNSF and"/"or"Le créateur n'est pas responsable pour n'importe quel type de perte de données suite à une modification du jeu.",
-        FNSF and"/"or"Si vous ne parvenez pas à utiliser à la fois WeChat Pay et AliPay,",
-        FNSF and"/"or"vous pouvez vous rendre sur notre page P\97\116\114\101\111\110 pour nous soutenir !",
+        FNNS and"/"or"Le créateur n'est pas responsable pour n'importe quel type de perte de données suite à une modification du jeu.",
+        -- FNNS and"/"or"Check Zictionary for more",
    },
    staff={
        "Author: MrZ  E-mail: 1046101471@qq.com",
--- a/parts/language/lang_id.lua
+++ b/parts/language/lang_id.lua
@@ -206,9 +206,8 @@ return{
        "Pastikan untuk mendapat permainan ini hanya dari sumber resmi,",
        "karena kita tidak bisa meyakinkan Anda aman jika Anda mendapat permainan ini dari sumber lain.",
        "Penciptanya tidak bertanggung jawab untuk modifikasi.",
-        FNSF and"/"or"Permainan ini gratis, tetapi sumbangan sangat dihargai.",
-        FNSF and"/"or"Jika Anda tidak bisa menggunakan WeChat Pay atau AliPay,",
-        FNSF and"/"or"Anda bisa pergi ke halaman P\97\116\114\101\111\110 kita (Link in Zictionary) untuk mendukung kami!",
+        FNNS and"/"or"Permainan ini gratis, tetapi sumbangan sangat dihargai.",
+        -- FNNS and"/"or"Check Zictionary for more",
    },
    staff={
        "Pencipta: MrZ  Email: 1046101471@qq.com",
--- a/parts/language/lang_pt.lua
+++ b/parts/language/lang_pt.lua
@@ -194,9 +194,8 @@ return{
        "certifique-se de pegar o jogo de fontes oficiais;",
        "binários obtidos em outros lugares pode conter malware.",
        "O autor não é responsável por qualquer binários modificados",
-        FNSF and"/"or"O jogo é gratis, mas doações são apreciadas.",
-        FNSF and"/"or"Se você não conseguir usar o WeChat Pay e o AliPay,",
-        FNSF and"/"or"pode acessar a página do P\97\116\114\101\111\110 para nos ajudar!",
+        FNNS and"/"or"O jogo é gratis, mas doações são apreciadas.",
+        -- FNNS and"/"or"Check Zictionary for more",
    },
    staff={
        "Author: MrZ E-mail: 1046101471@qq.com",
--- a/parts/language/lang_symbol.lua
+++ b/parts/language/lang_symbol.lua
@@ -130,8 +130,7 @@ return{
        "MrZ XXX A→B",
        "",
        "□$X, ↑$↑ XD!",
-        "C0, 支 XXX,",
-        "|^O : )",
+        "[z]~~~",
    },
    WidgetText={
        main={
--- a/parts/language/lang_zh.lua
+++ b/parts/language/lang_zh.lua
@@ -206,9 +206,8 @@ return{
        "仅通过官网 home.techmino.org 免费下载/更新",
        "其他渠道获得游戏皆有被修改/加广告/植入病毒的风险，程序只申请了振动&联网权限！",
        "若由于被修改的本游戏产生的各种损失作者不负责(怎么负责啊我又没法管)",
-        FNSF and"/"or"请从正规途径获得最新版，游戏现为免费，不过有打赏当然感谢啦~",
-        FNSF and"/"or"记得备注id备注id备注id，不然可能会没法记录到赞助列表！",
-        FNSF and"/"or"你也可以去我们的P\97\116\114\101\111\110页面(链接见小Z词典)来支持我们！",
+        FNNS and"/"or"请从正规途径获得最新版，游戏现为免费，不过有打赏当然感谢啦~",
+        FNNS and"/"or"更多信息见小z词典",
    },
    staff={
        "作者:MrZ  邮箱:1046101471@qq.com",
--- a/parts/language/lang_zh_grass.lua
+++ b/parts/language/lang_zh_grass.lua
@@ -204,9 +204,8 @@ return{
        "确保只从官方渠道获得游戏，",
        "因为如果你在别处找到它，我们无法确保你的安全",
        "作者不对任何修改负责",
-        FNSF and"/"or"虽然游戏是免费的，但我们会感谢捐赠.",
-        FNSF and"/"or"如果您无法同时使用我们的聊天支付和阿里支付，",
-        FNSF and"/"or"你可以去我们的P\97\116\114\111\110页面（连接到四联词典）支持我们！",
+        FNNS and"/"or"虽然游戏是免费的，但我们感谢捐款。",
+        FNNS and"/"or"查看Zictionary以了解更多信息",
    },
    staff={
        "作者:Z先生  邮箱:1046101471@qq.com",
--- a/parts/language/lang_zh_trad.lua
+++ b/parts/language/lang_zh_trad.lua
@@ -206,8 +206,8 @@ return{
        "僅透過內測QQ群/discord伺服器進行免費下載/更新",
        "從其他渠道獲得遊戲皆有被修改/加入廣告/植入病毒的風險，程序只申請了振動&網路權限！",
        "若由於被修改的本遊戲產生的各種損失作者概不負責（我怎麼負責啊跟我有什麼關係）",
-        FNSF and"/"or"請從正規途徑獲得最新版，遊戲現為免費，不過有讚賞當然感謝啦~ 記得備註用戶名，方便記錄！",
-        FNSF and"/"or"如果你不使用微信或支付寶，你可以前往我們的P\97\116\114\101\111\110頁面來贊助我們！"
+        FNNS and"/"or"請從正規途徑獲得最新版，遊戲現為免費，不過有打賞當然感謝啦~",
+        FNNS and"/"or"更多資訊見小z詞典"
    },
    staff={
        "作者:MrZ  電郵:1046101471@qq.com",
--- a/parts/scenes/app_console.lua
+++ b/parts/scenes/app_console.lua
@@ -528,7 +528,7 @@ local commands={}do
    }
    commands.support={
        code=function(arg)
-            if not FNSF or(arg:find"fk"and arg:find"pl")then
+            if not FNNS or(arg:find"fk"and arg:find"pl")then
                SCN.go('support','none')
            end
        end,
--- a/parts/scenes/dict.lua
+++ b/parts/scenes/dict.lua
@@ -32,7 +32,7 @@ local typeColor={
 local function _filter(word_org)
    local word=word_org
    word=word:gsub("[Tt]etris",CHAR.zChan.thinking)
-    if FNSF then word=word:gsub("[Pp]\97\116\114\101\111\110",CHAR.zChan.qualified)end
+    if FNNS then word=word:gsub("[Pp]\97\116\114\101\111\110",CHAR.zChan.qualified)end
    return word,word_org
 end
 local function _scanDict(D)
--- a/parts/scenes/support.lua
+++ b/parts/scenes/support.lua
@@ -16,8 +16,8 @@ function scene.draw()
 end

 scene.widgetList={
-    WIDGET.newImage{name='pay1',  x=300,y=100,hide=FNSF},
-    WIDGET.newImage{name='pay2',  x=720,y=320,hide=FNSF},
+    WIDGET.newImage{name='pay1',  x=300,y=100,hide=FNNS},
+    WIDGET.newImage{name='pay2',  x=720,y=320,hide=FNNS},
    WIDGET.newButton{name="back", x=1140,y=640,w=170,h=80,font=60,fText=CHAR.icon.back,code=backScene},
 }
 return scene