diff --git a/extension/boss/extension.js b/extension/boss/extension.js
index d4f2cd6bc..0e4118f12 100644
--- a/extension/boss/extension.js
+++ b/extension/boss/extension.js
@@ -191,34 +191,30 @@ game.import('play',function(){
if(get.mode()=='tafang') return;
var loadversus=function(){
if(get.mode()!='versus'){
- lib.init.js(lib.assetURL+'mode','versus',function(){
- var mode=lib.imported.mode;
- for(var i in mode.versus.translate){
- lib.translate[i]=lib.translate[i]||mode.versus.translate[i];
+ game.loadModeAsync('versus',function(mode){
+ for(var i in mode.translate){
+ lib.translate[i]=lib.translate[i]||mode.translate[i];
}
- for(var i in mode.versus.skill){
+ for(var i in mode.skill){
if(lib.skill[i]) console.log(i);
if(i!='versus_ladder'){
- lib.skill[i]=lib.init.eval(mode.versus.skill[i]);
+ lib.skill[i]=lib.init.eval(mode.skill[i]);
game.finishSkill(i);
}
}
- delete lib.imported.mode.versus;
});
}
};
if(get.mode()!='boss'){
- lib.init.js(lib.assetURL+'mode','boss',function(){
- var mode=lib.imported.mode;
- for(var i in mode.boss.translate){
- lib.translate[i]=lib.translate[i]||mode.boss.translate[i];
+ game.loadModeAsync('boss',function(mode){
+ for(var i in mode.translate){
+ lib.translate[i]=lib.translate[i]||mode.translate[i];
}
- for(var i in mode.boss.skill){
+ for(var i in mode.skill){
if(lib.skill[i]) console.log(i);
- lib.skill[i]=lib.init.eval(mode.boss.skill[i]);
+ lib.skill[i]=lib.init.eval(mode.skill[i]);
game.finishSkill(i);
}
- delete lib.imported.mode.boss;
loadversus();
});
}
@@ -226,8 +222,5 @@ game.import('play',function(){
loadversus();
}
},
- help:{
- '挑战武将':'
- 在非挑战模式中使用挑战武将'
- },
};
});
diff --git a/extension/cardpile/extension.js b/extension/cardpile/extension.js
index 8baf7c618..30b591be1 100644
--- a/extension/cardpile/extension.js
+++ b/extension/cardpile/extension.js
@@ -99,8 +99,5 @@ game.import('play',function(){
}
}
},
- help:{
- '牌堆补充':'
- 将杀闪等牌在牌堆中的比例维持在与军争牌堆相同,防止开启扩展包后重要的牌被过多地稀释'
- },
};
});
diff --git a/game/game.js b/game/game.js
index 93e7f985b..98247855c 100644
--- a/game/game.js
+++ b/game/game.js
@@ -3472,7 +3472,7 @@
restart:true,
},
intro:{
- name:'在非挑战模式中使用剑阁和挑战模式的武将',
+ name:'在其它模式中使用剑阁和挑战模式的武将',
clear:true,
nopointer:true,
},
@@ -6483,11 +6483,6 @@
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--;
@@ -6937,7 +6932,7 @@
});
}
- var proceed=function(){
+ var proceed2=function(){
var mode=lib.imported.mode;
var card=lib.imported.card;
var character=lib.imported.character;
@@ -7329,16 +7324,16 @@
}
delete lib.extensions;
- var proceed=function(){
- if(lib.init.startBefore){
- lib.init.startBefore();
- delete lib.init.startBefore;
- }
- ui.create.arena();
- game.createEvent('game',false).setContent(lib.init.start);
- delete lib.init.start;
- game.loop();
- };
+ if(lib.init.startBefore){
+ lib.init.startBefore();
+ delete lib.init.startBefore;
+ }
+ ui.create.arena();
+ game.createEvent('game',false).setContent(lib.init.start);
+ delete lib.init.start;
+ game.loop();
+ }
+ var proceed=function(){
if(!lib.db){
try{
lib.storage=JSON.parse(localStorage.getItem(lib.configprefix+lib.config.mode));
@@ -7349,15 +7344,15 @@
lib.storage={};
localStorage.setItem(lib.configprefix+lib.config.mode,"{}");
}
- proceed();
+ proceed2();
}
else{
game.getDB('data',lib.config.mode,function(obj){
lib.storage=obj||{};
- proceed();
+ proceed2();
});
}
- }
+ };
if(!lib.imported.mode||!lib.imported.mode[lib.config.mode]){
window.inSplash=true;
clearTimeout(window.resetGameTimeout);
@@ -8694,12 +8689,11 @@
},
loadMode:function(){
'step 0'
- event.removegame=window.game!=game;
- if(event.removegame) window.game=game;
+ window.game=game;
lib.init.js(lib.assetURL+'mode',event.mode,game.resume);
game.pause();
'step 1'
- if(event.removegame) delete window.game;
+ if(!lib.config.dev) delete window.game;
event.result=lib.imported.mode[event.mode];
delete lib.imported.mode[event.mode];
},
@@ -20802,7 +20796,20 @@
if(!lib.imported[type]){
lib.imported[type]={};
}
+ var bool_ui=!window.ui;
+ var bool_get=!window.get;
+ var bool_ai=!window.ai;
+ var bool_lib=!window.lib;
+ window.ui=ui;
+ window.get=get;
+ window.ai=ai;
+ window.lib=lib;
+ window._status=_status;
var content2=content();
+ if(bool_ui) delete window.ui;
+ if(bool_get) delete window.get;
+ if(bool_ai) delete window.ai;
+ if(bool_lib) delete window.lib;
if(content2.name){
lib.imported[type][content2.name]=content2;
delete content2.name;
@@ -24774,10 +24781,9 @@
return players[0];
},
loadModeAsync:function(name,callback){
- var removegame=window.game!=game;
- if(removegame) window.game=game;
+ window.game=game;
var script=lib.init.js(lib.assetURL+'mode',name,function(){
- if(removegame) delete window.game;
+ if(!lib.config.dev) delete window.game;
script.remove();
var content=lib.imported.mode[name];
delete lib.imported.mode[name];
@@ -24795,10 +24801,9 @@
}
}
}
- var removegame=window.game!=game;
- if(removegame) window.game=game;
+ window.game=game;
var script=lib.init.js(lib.assetURL+'mode',name,function(){
- if(removegame) delete window.game;
+ if(!lib.config.dev) delete window.game;
script.remove();
var mode=lib.imported.mode;
_status.sourcemode=lib.config.mode;
@@ -31757,15 +31762,9 @@
},function(){
onprogress(-1);
_status.importingExtension=true;
- var removegame=false;
- if(window.game!=game){
- window.game=game;
- removegame=true;
- }
+ window.game=game;
lib.init.js(lib.assetURL+'extension/'+that.info.name,'extension',function(){
- if(removegame){
- delete window.game;
- }
+ if(!lib.config.dev) delete window.game;
if(game.importedPack){
var extname=game.importedPack.name;
if(lib.config.extensions.contains(extname)){
diff --git a/game/package.js b/game/package.js
index fa8851527..c7bc15f3d 100644
--- a/game/package.js
+++ b/game/package.js
@@ -28,7 +28,7 @@ window.noname_package={
hearth:'炉石传说',
},
play:{
- boss:'剑阁挑战',
+ boss:'诸神降临',
cardpile:'牌堆补充',
wuxing:'五行生克',
coin:'富甲天下',
diff --git a/game/update.js b/game/update.js
index 01eab1de3..e5862321c 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,8 +1,8 @@
window.noname_update={
- version:'1.9.24',
+ version:'1.9.24.1',
// update:'1.9.23',
changeLog:[
- '神之试炼',
+ 'bug修复',
],
files:[
// 'game/game.js',