refresh

card/extra.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'extra',
 		connect:true,
 		card:{
@@ -602,4 +609,5 @@ game.import('card',{
 			["spade",10,"bingliang"],
 			["club",4,"bingliang"],
 		],
+	}
 });

card/gujian.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'gujian',
 	    card:{
 	        luyugeng:{
@@ -1686,4 +1693,5 @@ game.import('card',{
 	        ['club',3,'liufengsan'],
 
 	    ]
+	};
 });

card/guozhan.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'guozhan',
 		connect:true,
 		card:{
@@ -1185,4 +1192,5 @@ game.import('card',{
 			['diamond',4,'xietianzi'],
 			['club',1,'yuxi'],
 		],
+	}
 });

card/hearth.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'hearth',
 		card:{
 			linghunzhihuo:{
@@ -715,4 +722,5 @@ game.import('card',{
 			['diamond',2,'jihuocard'],
 			['diamond',1,'linghunzhihuo'],
 		],
+	};
 });

card/sp.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'sp',
 		connect:true,
 		card:{
@@ -978,4 +985,5 @@ game.import('card',{
 			["spade",2,'lanyinjia'],
 			["club",2,'lanyinjia'],
 		],
+	};
 });

card/standard.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'standard',
 		connect:true,
 		card:{
@@ -2011,4 +2018,5 @@ game.import('card',{
 			["heart",12,'shandian','thunder'],
 			["diamond",12,'wuxie'],
 		],
+	};
 });

card/swd.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'swd',
 		card:{
 			dujian:{
@@ -5179,4 +5186,5 @@ game.import('card',{
 			// ['club',11,'dujian','poison'],
 			// ['club',12,'dujian','poison'],
 		],
+	};
 });

card/yunchou.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'yunchou',
 		card:{
 			diaobingqianjiang:{
@@ -1156,4 +1163,5 @@ game.import('card',{
 			['club',2,'youdishenru'],
 			['spade',9,'youdishenru'],
 		],
+	};
 });

card/zhenfa.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('card',{
+game.import('card',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'zhenfa',
 		card:{
 			pozhenjue:{
@@ -439,4 +446,5 @@ game.import('card',{
 			// ["spade",13,'pozhenjue'],
 			//["heart",13,'pozhenjue'],
 		],
+	};
 });

character/diy.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'diy',
 		character:{
 			// diy_caocao:['male','wei',4,['xicai','diyjianxiong','hujia']],
@@ -1393,4 +1400,5 @@ game.import('character',{
 			xicai_info:'你可以立即获得对你造成伤害的牌',
 			diyjianxiong_info:'锁定技，在身份局中，在你回合内死亡的角色均视为反贼，国战中，在你回合内死亡的角色若与你势力相同则随机改为另一个势力',
 		},
+	};
 });

character/extra.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'extra',
 		character:{
 			shen_guanyu:['male','shen',6,['wuhun','wushen'],['shu']],
@@ -1228,4 +1235,5 @@ game.import('character',{
 			wuqian:'无前',
 			wuqian_info:'出牌阶段，你可以弃置两枚暴怒标记并获得技能【无双】直到回合结束',
 		},
+	};
 });

character/gujian.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'gujian',
 		character:{
 			gjqt_bailitusu:['male','shu',4,['xuelu','fanshi','shahun']],
@@ -1658,4 +1665,5 @@ game.import('character',{
 			yuling_info:'锁定技，你没有摸牌和弃牌阶段，你的手牌数始终为5，你在一个出牌阶段最多使用X+2张牌，X为你的体力上限',
 			yuling_info_alter:'锁定技，你没有摸牌和弃牌阶段，你的手牌数始终为5，你在一个出牌阶段最多使用X+1张牌，X为你的体力上限',
 		},
+	};
 });

character/gwent.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'gwent',
 		character:{
 			gw_huoge:['male','qun',3,['quanzhang']],
@@ -913,4 +920,5 @@ game.import('character',{
 			quanzhang_backup:'权杖',
 			quanzhang_info:'出牌阶段限一次，你可以观看牌堆顶的6张牌，并选择一张使用',
 		}
+	};
 });

character/hearth.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'hearth',
     	character:{
     		hs_jaina:['female','wei',3,['huopu','aoshu','bingjia']],
@@ -6583,4 +6590,5 @@ game.import('character',{
     		wlianji:'连击',
     		wlianji_info:'结束阶段，若你本回合使用的卡牌数大于你当前的体力值，你可以摸两张牌',
     	},
+    };
 });

character/jiange.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'jiange',
 	    character:{
 	        jg_pangtong:['male','shu',3,['qiwu','tianyu']],
@@ -577,4 +584,5 @@ game.import('character',{
 	        jingfan_info:'回合内，每当你使用一张卡牌，你的进攻距离+1；出牌阶段结束时，你可以将手牌数补至X，并指定至多X名角色令其进攻距离+1直到其下一回合结束，X为你回合内使用的卡牌数',
 
 	    },
+	};
 });

character/old.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'old',
 	    character:{
 	        zhangjiao:['male','qun',3,['leiji','guidao','huangtian'],['zhu']],
@@ -372,4 +379,5 @@ game.import('character',{
 	        oldxuanfeng:'旋风',
 	        oldxuanfeng_info:'每当你失去一次装备区里的牌时，你可以执行下列两项中的一项：1.视为对任意一名其他角色使用一张【杀】（此【杀】不计入每回合的使用限制）；2.对与你距离1以内的一名其他角色造成一点伤害',
 	    }
+	};
 });

character/ow.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'ow',
 	    character:{
 	        ow_liekong:['female','shu',3,['shanxian','shanhui']],
@@ -3531,4 +3538,5 @@ game.import('character',{
 	        ow_heiying:'黑影',
 	        ow_orisa:'奥丽莎',
 	    }
+	};
 });

character/refresh.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'refresh',
 		connect:true,
 		character:{
@@ -1571,4 +1578,5 @@ game.import('character',{
 			reluoyi_info:'你可以跳过摸牌阶段，然后展示牌堆顶的三张牌，获得其中的基本牌、武器牌和【决斗】，若如此做，直到你的下回合开始，你为伤害来源的【杀】或【决斗】造成的伤害+1。',
 			reganglie_info:'每当你受到1点伤害后，可进行一次判定，若结果为红色，你对伤害来源造成1点伤害，若结果为黑色，你弃置其一张牌。'
 		},
+	};
 });

character/shenhua.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'shenhua',
     	connect:true,
     	character:{
@@ -4362,4 +4369,5 @@ game.import('character',{
     		fenji_info:'每当一名角色的手牌于回合外被弃置时，你可以失去1点体力，然后该角色摸两张牌。',
 
     	},
+    };
 });

character/sp.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'sp',
     	connect:true,
     	character:{
@@ -8784,4 +8791,5 @@ game.import('character',{
     		yicong_info:'锁定技，只要你的体力值大于2点，你的进攻距离+1；只要你的体力值为2点或更低，你的防御距离+1',
     		baobian_info:'锁定技，若你的体力值为3或更少，你视为拥有技能“挑衅”；若你的体力值为2或更少；你视为拥有技能“咆哮”；若你的体力值为1，你视为拥有技能“神速”。',
     	},
+    };
 });

character/standard.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'standard',
 		connect:true,
 		character:{
@@ -1760,4 +1767,5 @@ game.import('character',{
 			lijian_info:'出牌阶段，你可以弃一张牌，视为一名男性角色对另一名男性角色使用一张[决斗]，每阶段限一次',
 			biyue_info:'结束阶段，你可以摸一张牌',
 		},
+	};
 });

character/swd.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'swd',
     	character:{
     		swd_huzhongxian:['male','wu',3,['daofa','xielv','hujing']],
@@ -9767,4 +9774,5 @@ game.import('character',{
     		zaowu_old_info:'出牌阶段，你可以弃置三张不同类型的牌，创造任意两张牌并获得之',
     		xielv_info:'弃牌阶段结束后，若你的所有手牌（至少两张）颜色均相同，你可以展示所有手牌，然后回复一点体力并弃置场上的所有判定牌',
     	},
+    };
 });

character/xiake.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'xiake',
 	    character:{
 			// xk_dongfangweiming:['male','shu',4,[]],
@@ -119,4 +126,5 @@ game.import('character',{
 	        zitong:'通悟',
 	        zitong_info:'当你于自己的回合内使用第三张牌时，你可以将一张传送门置于你的手牌',
 	    },
+	};
 });

character/xianjian.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'xianjian',
 		character:{
 			pal_lixiaoyao:['male','qun',4,['tianjian','yufeng']],
@@ -2612,4 +2619,5 @@ game.import('character',{
 			tianshe2:'天蛇',
 			tianshe_info:'锁定技，你防止即将受到的属性伤害，每当你造成一次属性伤害，你回复一点体力',
 		},
+	};
 });

character/yijiang.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'yijiang',
     	connect:true,
     	character:{
@@ -7718,4 +7725,5 @@ game.import('character',{
     		zhichi2_info:'智迟已发动',
     		pojun_info:'你每使用【杀】造成一次伤害，可令受到该伤害的角色多摸X张牌，X为该角色当前的体力值(X最多为5)，然后该角色将其武将牌翻面。',
     	},
+    };
 });

character/yxs.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'yxs',
 		character:{
 			yxs_wuzetian:['female','wu',4,['nvquan','qiandu','weiyi']],
@@ -2990,4 +2997,5 @@ game.import('character',{
 			juma:'拒马',
 			juma_info:'你与其他角色的距离始终视为1。',
 		},
+	};
 });

character/zhuogui.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('character',{
+game.import('character',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'zhuogui',
 	    character:{
 			nianshou:['male','shu',4,['nianrui','qixiang']],
@@ -338,4 +345,5 @@ game.import('character',{
 	        xixing:'吸星',
 	        xixing_info:'出牌阶段限一次，你可以弃置三张不同类别的牌，对一名其他角色造成一点伤害，然后回复一点体力',
 	    },
+	};
 });

extension/boss/extension.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('play',{
+game.import('play',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'boss',
 		init:function(){
 			if(get.mode()=='tafang') return;
@@ -222,4 +229,5 @@ game.import('play',{
 		help:{
 			'挑战武将':'<ul><li>在非挑战模式中使用挑战武将'
 		},
+	};
 });

extension/cardpile/extension.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('play',{
+game.import('play',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'cardpile',
 		arenaReady:function(){
 	        var data={
@@ -95,4 +102,5 @@ game.import('play',{
 		help:{
 			'牌堆补充':'<ul><li>将杀闪等牌在牌堆中的比例维持在与军争牌堆相同，防止开启扩展包后重要的牌被过多地稀释'
 		},
+	};
 });

extension/coin/extension.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('play',{
+game.import('play',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'coin',
 		init:function(){
 			if(lib.config.mode!='chess'||get.config('chess_mode')!='leader'){
@@ -1370,4 +1377,5 @@ game.import('play',{
 			'<li>修改金币：<br>game.changCoin'+
 			'<li>默认下雪：<br>game.haveFun.alwaysSnow'
 		}
+	};
 });

extension/wuxing/extension.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('play',{
+game.import('play',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'wuxing',
 		arenaReady:function(){
 			if(_status.connectMode) return;
@@ -224,4 +231,5 @@ game.import('play',{
 			'须弃置一张牌<li>当一名角色成为相生的卡牌的目标时，须摸一张牌'+
 			'<li>金克木，金生水；<br>木克土，木生火；<br>水克火，水生木；<br>火克金，火生土；<br>土克水，土生金'
 		}
+	};
 });

game/game.js

@@ -6474,6 +6474,11 @@
 
 
 					window.game=game;
+					window.lib=lib;
+					window.ui=ui;
+					window.ai=ai;
+					window.get=get;
+					window._status=_status;
 					var styleToLoad=6;
 					var styleLoaded=function(){
 						styleToLoad--;
@@ -6922,16 +6927,21 @@
 					var character=lib.imported.character;
 					var play=lib.imported.play;
 					delete window.game;
+					delete window.ui;
+					delete window.get;
+					delete window.ai;
+					delete window.lib;
+					delete window._status;
 					var i,j,k;
 					for(i in mode[lib.config.mode].element){
 						if(!lib.element[i]) lib.element[i]=[];
 						for(j in mode[lib.config.mode].element[i]){
 							if(j=='init'){
 								if(!lib.element[i].inits) lib.element[i].inits=[];
-								lib.element[i].inits.push(lib.init.eval(mode[lib.config.mode].element[i][j]));
+								lib.element[i].inits.push(mode[lib.config.mode].element[i][j]);
 							}
 							else{
-								lib.element[i][j]=lib.init.eval(mode[lib.config.mode].element[i][j]);
+								lib.element[i][j]=mode[lib.config.mode].element[i][j];
 							}
 						}
 					}
@@ -6939,32 +6949,32 @@
 						if(typeof mode[lib.config.mode].ai[i]=='object'){
 							if(ai[i]==undefined) ai[i]={};
 							for(j in mode[lib.config.mode].ai[i]){
-								ai[i][j]=lib.init.eval(mode[lib.config.mode].ai[i][j]);
+								ai[i][j]=mode[lib.config.mode].ai[i][j];
 							}
 						}
 						else{
-							ai[i]=lib.init.eval(mode[lib.config.mode].ai[i]);
+							ai[i]=mode[lib.config.mode].ai[i];
 						}
 					}
 					for(i in mode[lib.config.mode].ui){
 						if(typeof mode[lib.config.mode].ui[i]=='object'){
 							if(ui[i]==undefined) ui[i]={};
 							for(j in mode[lib.config.mode].ui[i]){
-								ui[i][j]=lib.init.eval(mode[lib.config.mode].ui[i][j]);
+								ui[i][j]=mode[lib.config.mode].ui[i][j];
 							}
 						}
 						else{
-							ui[i]=lib.init.eval(mode[lib.config.mode].ui[i]);
+							ui[i]=mode[lib.config.mode].ui[i];
 						}
 					}
 					for(i in mode[lib.config.mode].game){
-						game[i]=lib.init.eval(mode[lib.config.mode].game[i]);
+						game[i]=mode[lib.config.mode].game[i];
 					}
 					for(i in mode[lib.config.mode].get){
-						get[i]=lib.init.eval(mode[lib.config.mode].get[i]);
+						get[i]=mode[lib.config.mode].get[i];
 					}
 					lib.init.start=mode[lib.config.mode].start;
-					lib.init.startBefore=lib.init.eval(mode[lib.config.mode].startBefore);
+					lib.init.startBefore=mode[lib.config.mode].startBefore;
 					if(game.onwash){
 						lib.onwash.push(game.onwash);
 						delete game.onwash;
@@ -6990,11 +7000,11 @@
 						if(i=='startBefore') continue;
 						if(lib[i]==undefined) lib[i]=(get.objtype(mode[lib.config.mode][i])=='array')?[]:{};
 						for(j in mode[lib.config.mode][i]){
-							lib[i][j]=lib.init.eval(mode[lib.config.mode][i][j]);
+							lib[i][j]=mode[lib.config.mode][i][j];
 						}
 					}
                     if(typeof mode[lib.config.mode].init=='function'){
-                        (lib.init.eval(mode[lib.config.mode].init))();
+                        mode[lib.config.mode].init();
                     }
 
                     var connectCharacterPack=[];
@@ -7037,7 +7047,7 @@
 								}
 								else{
 									if(lib[j][k]==undefined){
-										lib[j][k]=lib.init.eval(character[i][j][k]);
+										lib[j][k]=character[i][j][k];
 										if(j=='card'&&lib[j][k].derivation){
 											if(!lib.cardPack.mode_derivation){
 												lib.cardPack.mode_derivation=[k];
@@ -7100,7 +7110,7 @@
     								if(lib.config.cards.contains(i)){
     									var pile;
     									if(typeof card[i][j]=='function'){
-    										pile=lib.init.eval(card[i][j])();
+    										pile=card[i][j]();
     									}
     									else{
     										pile=card[i][j];
@@ -7131,7 +7141,7 @@
 										lib[j][k+'_card_config']=card[i][j][k];
 									}
 									else{
-										if(lib[j][k]==undefined) lib[j][k]=lib.init.eval(card[i][j][k]);
+										if(lib[j][k]==undefined) lib[j][k]=card[i][j][k];
 										else console.log('dublicate '+j+' in card '+i+':\n'+k+'\n'+lib[j][k]+'\n'+card[i][j][k]);
                                         if(j=='card'&&lib[j][k].derivation){
 											if(!lib.cardPack.mode_derivation){
@@ -7169,10 +7179,10 @@
     							for(k in play[i].element[j]){
     								if(k=='init'){
     									if(!lib.element[j].inits) lib.element[j].inits=[];
-    									lib.element[j].inits.push(lib.init.eval(play[i].element[j][k]));
+    									lib.element[j].inits.push(play[i].element[j][k]);
     								}
     								else{
-    									lib.element[j][k]=lib.init.eval(play[i].element[j][k]);
+    									lib.element[j][k]=play[i].element[j][k];
     								}
     							}
     						}
@@ -7180,18 +7190,18 @@
     							if(typeof play[i].ui[j]=='object'){
     								if(ui[j]==undefined) ui[j]={};
     								for(k in play[i].ui[j]){
-    									ui[j][k]=lib.init.eval(play[i].ui[j][k]);
+    									ui[j][k]=play[i].ui[j][k];
     								}
     							}
     							else{
-    								ui[j]=lib.init.eval(play[i].ui[j]);
+    								ui[j]=play[i].ui[j];
     							}
     						}
     						for(j in play[i].game){
-    							game[j]=lib.init.eval(play[i].game[j]);
+    							game[j]=play[i].game[j];
     						}
     						for(j in play[i].get){
-    							get[j]=lib.init.eval(play[i].get[j]);
+    							get[j]=play[i].get[j];
     						}
     						for(j in play[i]){
     							if(j=='mode'||j=='forbid'||j=='init'||j=='element'||
@@ -7204,11 +7214,11 @@
     									if(lib[j][k]!=undefined){
     										console.log('dublicate '+j+' in play '+i+':\n'+k+'\n'+': '+lib[j][k]+'\n'+play[i][j][k]);
     									}
-    									lib[j][k]=lib.init.eval(play[i][j][k]);
+    									lib[j][k]=play[i][j][k];
     								}
     							}
     						}
-    						if(typeof play[i].init=='function') (lib.init.eval(play[i].init))();
+    						if(typeof play[i].init=='function') play[i].init();
     						if(typeof play[i].arenaReady=='function') lib.arenaReady.push(play[i].arenaReady);
     					}
                     }
@@ -8668,9 +8678,12 @@
     			},
                 loadMode:function(){
     				'step 0'
+					event.removegame=window.game!=game;
+					if(event.removegame) window.game=game;
     				lib.init.js(lib.assetURL+'mode',event.mode,game.resume);
     				game.pause();
     				'step 1'
+					if(event.removegame) delete window.game;
     				event.result=lib.imported.mode[event.mode];
     				delete lib.imported.mode[event.mode];
     			},
@@ -20785,9 +20798,10 @@
 				if(!lib.imported[type]){
 					lib.imported[type]={};
 				}
-				if(content.name){
+				var content2=content();
-					lib.imported[type][content.name]=content;
+				if(content2.name){
-					delete content.name;
+					lib.imported[type][content2.name]=content2;
+					delete content2.name;
 				}
 			}
 		},
@@ -24751,7 +24765,10 @@
 			return players[0];
 		},
         loadModeAsync:function(name,callback){
+			var removegame=window.game!=game;
+			if(removegame) window.game=game;
             var script=lib.init.js(lib.assetURL+'mode',name,function(){
+				if(removegame) delete window.game;
                 script.remove();
 				var content=lib.imported.mode[name];
 				delete lib.imported.mode[name];
@@ -24769,7 +24786,10 @@
 					}
 				}
 			}
+			var removegame=window.game!=game;
+			if(removegame) window.game=game;
             var script=lib.init.js(lib.assetURL+'mode',name,function(){
+				if(removegame) delete window.game;
                 script.remove();
                 var mode=lib.imported.mode;
                 _status.sourcemode=lib.config.mode;

mode/boss.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'boss',
 		start:function(){
 			"step 0"
@@ -4188,4 +4195,5 @@ game.import('mode',{
 				return (from.side===to.side?6:-6);
 			}
 		}
+	};
 });

mode/brawl.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'brawl',
 	    game:{
 	        syncMenu:true,
@@ -2236,4 +2243,5 @@ game.import('mode',{
 	            }
 	        }
 	    },
+	};
 });

mode/chess.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'chess',
     	canvasUpdates2:[],
     	hiddenCharacters:[],
@@ -6020,4 +6027,5 @@ game.import('mode',{
     		'竞技场：<br>随机选择9名武将，每次派出1~3名武将参战。战斗中阵亡的武将不能再次上场。<br><br>战斗后武将进入疲劳状态，若立即再次出场则初始体力值-1。<br><br>战斗中本方武将行动时可召唤后援，令一名未出场的已方武将加入战斗。后援武将在战斗结束后无论存活与否均不能再次出场<br><br>当取得12场胜利或所有武将全部阵亡后结束，并根据胜场数获得随机奖励<li>'+
     		'修改金钱：<br>game.changeMoney<br>修改招募令：<br>game.changeDust</ul>'
     	},
+    };
 });

mode/connect.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'connect',
 	    start:function(){
 	        var directstartmode=lib.config.directstartmode;
@@ -139,4 +146,5 @@ game.import('mode',{
 	        };
 	        setTimeout(lib.init.onfree,1000);
 	    }
+	};
 });

mode/guozhan.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'guozhan',
 		startBefore:function(){
 			var playback=localStorage.getItem(lib.configprefix+'playback');
@@ -3626,4 +3633,5 @@ game.import('mode',{
 				return Math.min(0,Math.random()-0.5)+difficulty;
 			},
 		}
+	};
 });

mode/identity.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'identity',
 		start:function(){
 			"step 0"
@@ -1941,4 +1948,5 @@ game.import('mode',{
 			'首先由亮出身份的忠臣玩家随机获得六张武将牌，挑选一名角色，并将选好的武将牌展示给其他玩家。之后其余每名玩家随机获得三张武将牌，各自从其中挑选一张同时亮出<li>'+
 			'亮出身份牌的忠臣增加1点体力上限。角色濒死和死亡的结算及胜利条件与普通身份局相同。',
 		}
+	};
 });

mode/realtime.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'realtime',
 	    start:function(){
 
@@ -7,4 +14,5 @@ game.import('mode',{
 	    game:{
 
 	    }
+	};
 });

mode/stone.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'stone',
     	start:function(){
     		"step 0"
@@ -10209,4 +10216,5 @@ game.import('mode',{
     		'<li>嘲讽：若一方阵营中有嘲讽角色，则同阵营的无嘲讽角色不以能成为杀目标'+
     		'<li>行动顺序为先主将后随从。主将或随从死亡后立即移出游戏，主将死亡后替补登场，替补登场时摸3+X张牌，X为对方存活的随从数，无替补时游戏结束'
     	}
+    };
 });

mode/tafang.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+	var game=window.game;
+	var ui=window.ui;
+	var get=window.get;
+	var ai=window.ai;
+	var lib=window.lib;
+	var _status=window._status;
+	return {
 		name:'tafang',
 		canvasUpdates2:[],
 		start:function(){
@@ -1233,4 +1240,5 @@ game.import('mode',{
 			'战场上最多出现3个相同的机关，每个机关在置入战场3轮后消失。战场上最多招募5名友方角色。<li>'+
 			'敌方角色到达底部出口时游戏失败，已方角色到达底部出口，将被移出游戏',
 		},
+	};
 });

mode/versus.js

@@ -1,5 +1,12 @@
 'use strict';
-game.import('mode',{
+game.import('mode',function(){
+    var game=window.game;
+    var ui=window.ui;
+    var get=window.get;
+    var ai=window.ai;
+    var lib=window.lib;
+    var _status=window._status;
+    return {
     	name:'versus',
     	init:function(){
     		if(get.config('versus_mode')=='jiange'){
@@ -4805,4 +4812,5 @@ game.import('mode',{
     		'8号位游戏开始时额外摸一张牌，7、8号位可在游戏开始时置换一次手牌<li>'+
     		'杀死对方忠臣摸2+x张牌，x为对方（含刚被杀的忠臣）与己方的存活人数之差；主公杀死己方忠臣须弃置所有牌',
     	}
+    };
 });