p

character/ow.js

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

character/swd.js

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

game/game.js

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

layout/newlayout/global.css

@@ -58,10 +58,10 @@
 	top:3px;
 	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;
 	top:5px;
-}
+}*/
 .player.minskin .hp,
 .player.minskin .hp.text{
 	left:88px;

mode/boss.js

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

mode/tafang.js

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