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

p

This commit is contained in:
libccy 2017-04-15 00:53:12 +08:00
parent b6b8793dcf
commit b67c2280b0
6 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
character/ow.js
View File

@ -3241,7 +3241,7 @@ character.ow={
player.storage.shanxian_e=player.getCards('e'); player.storage.shanxian_e=player.getCards('e');
player.storage.shanxian_n=1; player.storage.shanxian_n=1;
player.syncStorage('shanxian_e'); player.syncStorage('shanxian_e');
player.phase(); player.phase('shanxian');
player.storage.shanxian=trigger.player; player.storage.shanxian=trigger.player;
player.removeSkill('shanxian2'); player.removeSkill('shanxian2');
player.markSkill('shanxian'); player.markSkill('shanxian');

4
character/swd.js
View File

@ -8234,13 +8234,13 @@ character.swd={
}, },
duijueLoop:function(){ duijueLoop:function(){
'step 0' 'step 0'
targets[0].phase(); targets[0].phase('duijue');
'step 1' 'step 1'
if(targets[0].isDead()||targets[1].isDead()){ if(targets[0].isDead()||targets[1].isDead()){
event.goto(3); event.goto(3);
} }
else{ else{
targets[1].phase(); targets[1].phase('duijue');
} }
'step 2' 'step 2'
if(targets[0].isDead()||targets[1].isDead()){ if(targets[0].isDead()||targets[1].isDead()){

7
game/game.js
View File

@ -13439,13 +13439,16 @@
next.setContent('phase'); next.setContent('phase');
return next; return next;
}, },
phase:function(){ phase:function(skill){
var next=game.createEvent('phase'); var next=game.createEvent('phase');
next.player=this; next.player=this;
next.setContent('phase'); next.setContent('phase');
if(!_status.roundStart){ if(!_status.roundStart){
_status.roundStart=this; _status.roundStart=this;
} }
if(skill){
next.skill=skill;
}
return next; return next;
}, },
phaseJudge:function(){ phaseJudge:function(){
@ -19105,7 +19108,7 @@
} }
_status.currentPhase=player; _status.currentPhase=player;
game.phaseNumber++; game.phaseNumber++;
if(player==_status.roundStart){ if(player==_status.roundStart&&!event.skill){
game.roundNumber++; game.roundNumber++;
} }
game.syncState(); game.syncState();

4
layout/newlayout/global.css
View File

@ -58,10 +58,10 @@
top:3px; top:3px;
box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px; box-shadow: rgba(0, 0, 0, 0.2) 0 0 0 1px;
} }
#arena.uslim_player .player.minskin:not(.fakeme) .avatar:not(.fakeme){ /*#arena.uslim_player .player.minskin:not(.fakeme) .avatar:not(.fakeme){
left:5px; left:5px;
top:5px; top:5px;
} }*/
.player.minskin .hp, .player.minskin .hp,
.player.minskin .hp.text{ .player.minskin .hp.text{
left:88px; left:88px;

14
mode/boss.js
View File

@ -475,6 +475,7 @@ mode.boss={
var boss=ui.create.player(); var boss=ui.create.player();
boss.getId(); boss.getId();
boss.init(name); boss.init(name);
boss.side=true;
game.addVideo('bossSwap',game.boss,boss.name); game.addVideo('bossSwap',game.boss,boss.name);
if(game.me==game.boss){ if(game.me==game.boss){
boss.dataset.position=0; boss.dataset.position=0;
@ -543,7 +544,6 @@ mode.boss={
player.revive(player.hp); player.revive(player.hp);
} }
} }
if(game.bossinfo.loopType==2){ if(game.bossinfo.loopType==2){
game.boss.chongzheng=true; game.boss.chongzheng=true;
} }
@ -556,6 +556,7 @@ mode.boss={
} }
"step 1" "step 1"
if(game.bossinfo.loopType==2){ if(game.bossinfo.loopType==2){
_status.roundStart=true;
if(event.player==game.boss){ if(event.player==game.boss){
if(!_status.last||_status.last.nextSeat==game.boss){ if(!_status.last||_status.last.nextSeat==game.boss){
event.player=game.boss.nextSeat; event.player=game.boss.nextSeat;
@ -567,6 +568,9 @@ mode.boss={
else{ else{
_status.last=player; _status.last=player;
event.player=game.boss; event.player=game.boss;
if(player.nextSeat==game.boss){
delete _status.roundStart;
}
} }
} }
else{ else{
@ -956,8 +960,8 @@ mode.boss={
game.players[i].hp=game.players[i].maxHp; game.players[i].hp=game.players[i].maxHp;
game.players[i].update(); game.players[i].update();
} }
game.addFellow(game.me==game.boss?1:5,'boss_yanling','zoominanim').directgain(get.cards(4)); game.addFellow(game.me==game.boss?1:5,'boss_yanling','zoominanim').directgain(get.cards(4)).side=true;
game.addFellow(7,'boss_yanling','zoominanim').directgain(get.cards(4)); game.addFellow(7,'boss_yanling','zoominanim').directgain(get.cards(4)).side=true;
game.animate.window(2); game.animate.window(2);
'step 3' 'step 3'
while(_status.event.name!='phaseLoop'){ while(_status.event.name!='phaseLoop'){
@ -969,6 +973,7 @@ mode.boss={
_status.event.step=0; _status.event.step=0;
if(game.bossinfo){ if(game.bossinfo){
game.bossinfo.loopType=1; game.bossinfo.loopType=1;
_status.roundStart=game.boss;
} }
} }
}, },
@ -3071,6 +3076,7 @@ mode.boss={
} }
if(game.bossinfo){ if(game.bossinfo){
game.bossinfo.loopType=1; game.bossinfo.loopType=1;
_status.roundStart=game.boss;
} }
player.removeSkill('beige'); player.removeSkill('beige');
player.removeSkill('boss_hujia'); player.removeSkill('boss_hujia');
@ -3227,6 +3233,7 @@ mode.boss={
player.addSkill('zhuyu'); player.addSkill('zhuyu');
if(game.bossinfo){ if(game.bossinfo){
game.bossinfo.loopType=1; game.bossinfo.loopType=1;
_status.roundStart=game.boss;
} }
} }
}, },
@ -3558,6 +3565,7 @@ mode.boss={
_status.event.step=0; _status.event.step=0;
if(game.bossinfo){ if(game.bossinfo){
game.bossinfo.loopType=1; game.bossinfo.loopType=1;
_status.roundStart=game.boss;
} }
}, },
ai:{ ai:{

1
mode/tafang.js
View File

@ -388,6 +388,7 @@ mode.tafang={
var next=game.createEvent('phaseLoop'); var next=game.createEvent('phaseLoop');
next.setContent(function(){ next.setContent(function(){
'step 0' 'step 0'
delete _status.roundStart;
_status.turnCount++; _status.turnCount++;
_status.remainingCount-=_status.friends.length; _status.remainingCount-=_status.friends.length;
ui.turnCount.innerHTML='回合'+get.cnNumber(_status.turnCount,true); ui.turnCount.innerHTML='回合'+get.cnNumber(_status.turnCount,true);