YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #729 from nonameShijian/PR-Branch 

修正异步事件的代理对象，取消低版本兼容代码，修复game.promises.prompt的bug
This commit is contained in:
Spmario233 2023-12-17 00:02:39 +08:00 committed by GitHub
parent 41d5505844 8c8f8950f8
commit a346aa75d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
game/game.js
View File

@ -32185,8 +32185,11 @@ new Promise(resolve=>{
has(target,prop){ has(target,prop){
return Reflect.has(event,prop); return Reflect.has(event,prop);
}, },
ownKeys(target,prop){ ownKeys(target){
return Reflect.ownKeys(event,prop); return Reflect.ownKeys(event);
},
getOwnPropertyDescriptor(target,prop){
return Reflect.getOwnPropertyDescriptor(event,prop);
}, },
}); });
} }
@ -36215,8 +36218,9 @@ new Promise(resolve=>{
* 注: 由于参数列表是随意的，在这里我准备限制一下这个函数的参数顺序 * 注: 由于参数列表是随意的，在这里我准备限制一下这个函数的参数顺序
* *
* @type {{ * @type {{
* (title: string, forced?: boolean): Promise<string>; * (title: string): Promise<string | false>;
* (alertOption: 'alert', title: string, forced?: boolean): Promise<string>; * (title: string, forced: true): Promise<string>;
* (alertOption: 'alert', title: string): Promise<true>;
* }} * }}
* *
* @param { string } title 设置prompt标题与input内容 * @param { string } title 设置prompt标题与input内容
@ -36235,10 +36239,10 @@ new Promise(resolve=>{
return new Promise((resolve,reject)=>{ return new Promise((resolve,reject)=>{
if(alertOption!='alert'){ if(alertOption!='alert'){
forced=title||false; forced=title||false;
title=option; title=alertOption;
game.prompt(title,forced,resolve); game.prompt(title,forced,resolve);
}else{ }else{
game.prompt(alertOption,title,forced,resolve); game.prompt(title,alertOption,resolve);
} }
}); });
}, },
@ -36254,7 +36258,7 @@ new Promise(resolve=>{
*/ */
alert(title){ alert(title){
return new Promise((resolve,reject)=>{ return new Promise((resolve,reject)=>{
game.prompt('alert',title,resolve); game.prompt(title,'alert',resolve);
}); });
}, },
// 读写函数promises化(不用考虑其对应函数是否存在) // 读写函数promises化(不用考虑其对应函数是否存在)
@ -51547,16 +51551,14 @@ new Promise(resolve=>{
writable:false writable:false
} }
}); });
if(typeof window.Proxy=='function'){ proxyWindow=new Proxy(proxyWindow,{
proxyWindow=new Proxy(proxyWindow,{ set(target,prop,newValue) {
set(target,prop,newValue) { if (!['_status','lib','game','ui','get','ai','cheat'].includes(prop)){
if (!['_status','lib','game','ui','get','ai','cheat'].includes(prop)){ Reflect.set(window, prop, newValue);
Reflect.set(window, prop, newValue);
}
return Reflect.set(target,prop,newValue);
} }
}); return Reflect.set(target,prop,newValue);
} }
});
//使用new Function隔绝作用域，避免在控制台可以直接访问到runCommand等变量 //使用new Function隔绝作用域，避免在控制台可以直接访问到runCommand等变量
/** /**
* @type { (value:string)=>any } * @type { (value:string)=>any }
@ -63835,8 +63837,8 @@ new Promise(resolve=>{
} }
} }
}, },
//我愚蠢的弟弟呦，这是最后一次兼容46内核兼容版了 //不兼容你了，弟弟
get:get get,
}; };
/** /**
* @template T * @template T