From 195967b2a176f48d5df1a8982e93b686f4585970 Mon Sep 17 00:00:00 2001 From: nonameShijian <2954700422@qq.com> Date: Mon, 29 Jan 2024 17:30:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=ADexe=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=9C=89=E5=90=AF=E5=8A=A8=E5=8F=82=E6=95=B0=E5=88=99=E4=B8=8D?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=89=93=E5=BC=80=E9=BB=98=E8=AE=A4=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=EF=BC=8C=E7=BB=A7=E7=BB=AD=E4=B8=BA=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=B8=BAhttp=E5=8D=8F=E8=AE=AE=E5=81=9A=E5=87=86?= =?UTF-8?q?=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- game/entry.js | 34 ++++++---------------------------- game/game.js | 17 +++++++++++++++++ noname-server.exe | Bin 70686208 -> 70686720 bytes noname/init/index.js | 13 ++++++++----- 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/game/entry.js b/game/entry.js index c450e7350..1c5249e6c 100644 --- a/game/entry.js +++ b/game/entry.js @@ -1,24 +1,5 @@ -/* - const module = import('../noname.js'); - - module.then(({ ai, game, get, lib, _status, ui, boot }) => { - const coreAndVersion = get.coreInfo(); - const core = coreAndVersion[0], version = coreAndVersion[1]; - if (core === 'chrome' && !isNaN(version) && version < 77) { - const tip = '检测到您的浏览器内核版本小于77，请及时升级浏览器或手机webview内核！'; - console.warn(tip); - game.print(tip); - const redirect_tip = '您使用的浏览器或无名杀客户端内核版本过低，将在未来的版本被废弃！\n点击“确认”以前往GitHub下载最新版无名杀客户端（可能需要科学上网）。'; - if (confirm(redirect_tip)) { - window.open('https://github.com/libccy/noname/releases/tag/chromium77-client'); - } - } - boot().then(lib.other.ignore); - }); - */ - import { game, get, lib, boot } from "../noname.js"; -// import { canUseHttpProtocol } from "../noname/init/index.js"; +import { canUseHttpProtocol } from "../noname/init/index.js"; import { userAgent } from "../noname/util/index.js"; const coreAndVersion = get.coreInfo(); @@ -34,20 +15,17 @@ if (core === 'chrome' && !isNaN(version) && version < 77) { } // 判断是否从file协议切换到http/s协议 -// if (canUseHttpProtocol()) { + if (canUseHttpProtocol()) { /* - 升级方法一: + 升级方法: 1. 导出数据，然后以http/s协议重启 2. 以http/s协议导入数据 3. 保存http/s协议的状态，以后不再以file协议启动 - 升级方法二: - 1. app默认以http/s协议启动，发现没有数据后，以file协议重启 - 2. 以file协议导出数据 - 3. 以http/s协议重启，导入数据 */ // 导出数据到根目录的noname.config.txt // 成功导入后应删除noname.config.txt -// } else { boot().then(lib.other.ignore); -// } + } else { + boot().then(lib.other.ignore); + } diff --git a/game/game.js b/game/game.js index 0e4a4181e..11484dfec 100644 --- a/game/game.js +++ b/game/game.js @@ -86,6 +86,23 @@ new Promise(resolve => { exit() } else { + // 在http环境下修改__dirname + if (location.protocol.startsWith('http') && + typeof window.require == 'function' && + typeof window.process == 'object' && + typeof window.__dirname == 'string' && + window.__dirname.endsWith('electron.asar\\renderer')) { + const path = require('path'); + window.__dirname = path.join(path.resolve(), 'resources/app'); + // @ts-ignore + window.require = function (moduleId) { + try { + return module.require(moduleId); + } catch { + return module.require(path.join(window.__dirname, moduleId)); + } + }; + } const script = document.createElement('script') script.type = "module"; script.src = `${assetURL}game/entry.js`; diff --git a/noname-server.exe b/noname-server.exe index 02b6d56299b85505265ef586bb210104172f97f5..b2c2b1f2abed449eb95592f023fbd96bbf2e71b7 100644 GIT binary patch delta 5323 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 delta 5286 zcmXZcXIKtw7>9As(^E+jQd&~kWLNge-aBMR_Q>9pT}G6>9y=?dA~Snu3t8EF@0Is| zI^GZG@3`*!xWC?4SbVxy*tT@9_y~g`EGE*>*pQKsX6RwC$*|3mWp$t_OU9G{ix~kH z24z&tCS|Ftl(ovLY*aR7tFkLQl|$L9oGO>ftsGPy<*1xgUgfM@l&f-6?kb=1Q2CXo z@>1TafGVg8sluv=DyoX9;;Mx5Q6*I=Ra%u%WmP#CV1JzJ9QjJv;)l@Z8%~cE4Qnga8RU6e-1*&$cz3QNXR7cfG zbyi(eSJh2*SHY@>>Zw9hFV$Q1QGHcE)n5%z1JxikScR$~YN#5fhN}^3q#C70t1)V< z8mGpq32LI6q{39VnyjX%scM>ax0`uBvP5 zx=K?w)J=6urK{WOj=HPvsrxEJJx~wTBlTE4QBTz~^<2GBFV!pcTD?(k)jRcGeNZ3O zC-qrhCQ5{U`-S_;)lhS%MW-O3 zkQ*Ez4>*DoYnqCKLtf}scWgb?Tjy`c~Eg?`W<2EafV1cM18%}CNQc{S2kyc>xDOfd03O04cnnYADLjMc@B&`KD|iiW;4Qp^_wWHe!YB9) zU*IczgYWPIe!?&K4SygL{u;FYj2aAJgnvg9lO1p!bS>Oftn2lb%=G=xUb7@9y+Xa>!p1+;`#&>Gr6 zTL^@9&>lKK5Ojo2&>6ZwSLg=aAsBiQ+dU+4$@VE_z-K`f(*Ccs3P1Yr;klVJ)>g=sJyX248{fJm4HvtbU*g(#Q@^C22yU;!+I zMX(r_z*1NS%V7nqgjHaM)vyNE!a7(F8(<^E!Y0@ZTVN|}gE-g@J0Ko*!Y)XFL`Z_& zum_T1FYJT;Z~zX%AxMG4a0HIRF*pt<;3S-a({KjP!Z|n(sc-=y2SKumKgX@q6 zH{d4Rf^@hIci=AEgZq#H58xp@g2(U#p29PD4lm#(yn@&82HwIucn=@oBYc9-@CClY zH~0=e;3xco-|z=A;jdBa&q9L%jPUPhVzLA)u!gK)1KGe9vV$Gu0DH&@xga+pfXf}s!$E8Lk*}2wLt$*>ksNcU8o23p#e06M$j0VKvQT2&7lRfgjUcR+CWIxD{O-}*bX}&9(KYmNPt90g59tO zl3_3GgZ*#-4#FWwfx~bFj>0iG4kzFwoPyJE2F}7cI1j0C0WQKNxC~d|DqMr>kOnv4 zCftH_xD9vUF5H9rkO2?iAv}V|@C2U1Gk6X!;3d3**YF13!aH~mAK)W=g3s^;zQQ;7 z4nN>0{DR-`2QuNWh1Q=*g8_{2?`UGO1S_zHtY8D#z!tKD9pnIe$O*Y1H#k5Za0DmF z3(nvIuHXjlkPkc{KX`%{ctZgw2!)_96oH~p%#@<_X9`L*IwhICVpEOI=FARpMl17y zJ;hD#rmgJvHCfLs4~-8t`J27c5)2Me zp}G+zOevwsJ|=r_= 1.7; } } // 浏览器端