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

fix2

This commit is contained in:
libccy 2016-04-03 10:19:24 +08:00
parent 7f9e1446ae
commit 0930a3bcb5
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/game.js
View File

@ -8624,7 +8624,7 @@
} }
else{ else{
var hiddenCard=get.info(skills[i]).hiddenCard; var hiddenCard=get.info(skills[i]).hiddenCard;
if(typeof hiddenCard=='function'&&hiddenCard(player,'wuxie')){ if(typeof hiddenCard=='function'&&hiddenCard(this,'wuxie')){
return true; return true;
} }
} }

3
game/update.js
View File

@ -1,6 +1,7 @@
window.noname_update={ window.noname_update={
version:'1.8.2.1', version:'1.8.2.2',
changeLog:[ changeLog:[
'修复一个卡死问题',
'联机预览版（身份模式，标准包）', '联机预览版（身份模式，标准包）',
'新卡牌样式（by @_游离感_ ）', '新卡牌样式（by @_游离感_ ）',
] ]

20
mode/identity.js
View File

@ -939,14 +939,15 @@ mode.identity={
game.me.setIdentity(); game.me.setIdentity();
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
game.players[i].send(function(zhu,me,identity){ game.players[i].send(function(zhu,zhuid,me,identity){
for(var i in lib.playerOL){ for(var i in lib.playerOL){
lib.playerOL[i].setIdentity('cai'); lib.playerOL[i].setIdentity('cai');
} }
zhu.identityShown=true; zhu.identityShown=true;
zhu.setIdentity('zhu'); zhu.identity=zhuid;
zhu.setIdentity();
me.setIdentity(identity); me.setIdentity(identity);
},game.zhu,game.players[i],game.players[i].identity); },game.zhu,game.zhu.identity,game.players[i],game.players[i].identity);
} }
var list; var list;
@ -1000,10 +1001,16 @@ mode.identity={
event.list.remove(game.zhu.name); event.list.remove(game.zhu.name);
event.list.remove(game.zhu.name2); event.list.remove(game.zhu.name2);
game.zhu.maxHp++;
game.zhu.hp++;
game.zhu.update();
game.broadcast(function(zhu,name,name2){ game.broadcast(function(zhu,name,name2){
if(game.zhu!=game.me){ if(game.zhu!=game.me){
zhu.init(name,name2); zhu.init(name,name2);
} }
zhu.maxHp++;
zhu.hp++;
zhu.update();
},game.zhu,game.zhu.name,game.zhu.name2); },game.zhu,game.zhu.name,game.zhu.name2);
var list=[]; var list=[];
@ -1011,11 +1018,16 @@ mode.identity={
for(var i=0;i<game.players.length;i++){ for(var i=0;i<game.players.length;i++){
if(game.players[i]!=game.zhu){ if(game.players[i]!=game.zhu){
var num; var num;
if(event.zhongmode){
num=3;
}
else{
switch(game.players[i].identity){ switch(game.players[i].identity){
case 'zhong':num=4;break; case 'zhong':num=4;break;
case 'nei':num=5;break; case 'nei':num=5;break;
default:num=3;break; default:num=3;break;
} }
}
list.push([game.players[i],['选择角色',[event.list.randomRemove(num),'character']],selectButton,true]); list.push([game.players[i],['选择角色',[event.list.randomRemove(num),'character']],selectButton,true]);
} }
} }
@ -1180,7 +1192,7 @@ mode.identity={
if(this.ai.shown>0.95) this.ai.shown=0.95; if(this.ai.shown>0.95) this.ai.shown=0.95;
if(this.ai.shown<-0.5) this.ai.shown=-0.5; if(this.ai.shown<-0.5) this.ai.shown=-0.5;
var marknow=(this!=game.me&&get.config('auto_mark_identity')&&this.ai.identity_mark!='finished'); var marknow=(!_status.connectMode&&this!=game.me&&get.config('auto_mark_identity')&&this.ai.identity_mark!='finished');
if(true){ if(true){
if(marknow&&_status.clickingidentity&&_status.clickingidentity[0]==this){ if(marknow&&_status.clickingidentity&&_status.clickingidentity[0]==this){
for(var i=0;i<_status.clickingidentity[1].length;i++){ for(var i=0;i<_status.clickingidentity[1].length;i++){