Merge pull request #274 from Tipx-L/PR-Branch
Use Object.defineProperty, and Object.getOwnPropertyDescriptor to initialize instead.
This commit is contained in:
commit
16340a218d
|
@ -646,6 +646,12 @@ game.import('card',function(lib,game,ui,get,ai,_status){
|
||||||
* @deprecated
|
* @deprecated
|
||||||
*/
|
*/
|
||||||
_yongjian_zengyu:{
|
_yongjian_zengyu:{
|
||||||
|
get forceLoad(){
|
||||||
|
return lib.skill._gifting.forceLoad;
|
||||||
|
},
|
||||||
|
set forceLoad(forceLoad){
|
||||||
|
lib.skill._gifting.forceLoad=forceLoad;
|
||||||
|
},
|
||||||
get filter(){
|
get filter(){
|
||||||
return lib.skill._gifting.filter;
|
return lib.skill._gifting.filter;
|
||||||
},
|
},
|
||||||
|
|
|
@ -9200,7 +9200,7 @@
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
else{
|
else{
|
||||||
lib[j][k]=character[i][j][k];
|
Object.defineProperty(lib[j],k,Object.getOwnPropertyDescriptor(character[i][j],k));
|
||||||
}
|
}
|
||||||
if(j=='card'&&lib[j][k].derivation){
|
if(j=='card'&&lib[j][k].derivation){
|
||||||
if(!lib.cardPack.mode_derivation){
|
if(!lib.cardPack.mode_derivation){
|
||||||
|
|
Loading…
Reference in New Issue