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

reinit

This commit is contained in:
libccy 2016-04-06 16:23:34 +08:00
parent 2ed8f2e299
commit 18622ee8c6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
character/shenhua.js
View File

@ -2027,6 +2027,7 @@ character.shenhua={
}, },
filter:function(event,player){ filter:function(event,player){
if(event.type!='dying') return false; if(event.type!='dying') return false;
if(player!=event.dying) return false;
if(player.storage.niepan) return false; if(player.storage.niepan) return false;
}, },
content:function(){ content:function(){

10
game/game.js
View File

@ -11547,7 +11547,7 @@
game.getIdentityList=lib.init.eval(mode.game.getIdentityList); game.getIdentityList=lib.init.eval(mode.game.getIdentityList);
game.updateState=lib.init.eval(mode.game.updateState); game.updateState=lib.init.eval(mode.game.updateState);
if(mode.element&&mode.element.player&&mode.element.player.$dieAfter){ if(mode.element&&mode.element.player&&mode.element.player.$dieAfter){
lib.element.player.$dieAfter=mode.element.player.$dieAfter; lib.element.player.$dieAfter=lib.init.eval(mode.element.player.$dieAfter);
} }
} }
_status.event={ _status.event={
@ -11615,11 +11615,12 @@
game.getIdentityList=lib.init.eval(mode.game.getIdentityList); game.getIdentityList=lib.init.eval(mode.game.getIdentityList);
game.updateState=lib.init.eval(mode.game.updateState); game.updateState=lib.init.eval(mode.game.updateState);
if(mode.element&&mode.element.player&&mode.element.player.$dieAfter){ if(mode.element&&mode.element.player&&mode.element.player.$dieAfter){
lib.element.player.$dieAfter=mode.element.player.$dieAfter; lib.element.player.$dieAfter=lib.init.eval(mode.element.player.$dieAfter);
} }
} }
state=get.parsedResult(state); state=get.parsedResult(state);
game.players=[]; game.players=[];
game.dead=[];
for(var i in lib.characterPack){ for(var i in lib.characterPack){
for(var j in lib.characterPack[i]){ for(var j in lib.characterPack[i]){
lib.character[j]=lib.character[j]||lib.characterPack[i][j]; lib.character[j]=lib.character[j]||lib.characterPack[i][j];
@ -11645,6 +11646,9 @@
player.nickname=info.nickname; player.nickname=info.nickname;
player.identity=info.identity; player.identity=info.identity;
player.identityShown=info.identityShown; player.identityShown=info.identityShown;
player.hp=info.hp;
player.maxHp=info.maxHp;
player.hujia=info.hujia;
player.setNickname(); player.setNickname();
if(info.dead){ if(info.dead){
player.classList.add('dead'); player.classList.add('dead');
@ -19676,7 +19680,7 @@
node.link=page; node.link=page;
page.classList.add('menu-sym'); page.classList.add('menu-sym');
menuUpdates.push(function(){ menuUpdates.push(function(){
if(_status.connectMode){ if(_status.connectMode&&!lib.config.debug){
node.classList.add('off'); node.classList.add('off');
if(node.classList.contains('active')){ if(node.classList.contains('active')){
node.classList.remove('active'); node.classList.remove('active');