sk

CHANGELOG.MD

@@ -1,2 +1,4 @@
-1.5.8
-低性能模式改进
+1.6.0
+低性能模式优化
+双击换肤
+新手向导

character/rank.js

@@ -90,6 +90,7 @@ window.characterRank={
         'liuchen',
     ],
     am:[
+        'zhugeguo',
         'sp_caiwenji',
         'caorui',
         'manchong',

character/refresh.js

@@ -909,7 +909,8 @@ character.refresh={
 				result:{
 					player:function(player){
 						if(player.hp<=2) return player.num('h')==0?1:0;
-						return player.num('h')<player.hp?1:0;
+						if(player.num('h',{name:'sha',color:'red'})) return 1;
+						return player.num('h')<=player.hp?1:0;
 					}
 				},
 				effect:function(card,player){

character/sp.js

@@ -34,8 +34,63 @@ character.sp={
 		zhanglu:['male','qun',3,['yishe','bushi','midao'],['fullskin']],
 		wutugu:['male','qun',15,['ranshang','hanyong'],['fullskin']],
 		sp_caiwenji:['female','wei',3,['chenqing','mozhi'],['fullskin']],
+		zhugeguo:['female','shu',3,['yuhua','qirang'],['fullskin']],
 	},
 	skill:{
+		qirang:{
+			trigger:{player:'equipEnd'},
+			frequent:true,
+			content:function(){
+				player.gain(get.cardPile(function(card){
+					return get.type(card,'trick')=='trick';
+				}),'gain2');
+			},
+			ai:{
+				effect:{
+					target:function(card,player,target,current){
+						if(get.type(card)=='equip') return [1,3];
+					}
+				},
+				threaten:1.3
+			}
+		},
+		yuhua:{
+			trigger:{player:'phaseDiscardBegin'},
+			forced:true,
+			filter:function(event,player){
+				return player.num('h',{type:'basic'})<player.num('h');
+			},
+			content:function(){
+				'step 0'
+				var hs=player.get('h');
+				for(var i=0;i<hs.length;i++){
+					if(get.type(hs[i])=='basic'){
+						hs.splice(i--,1);
+					}
+				}
+				if(hs.length){
+					player.lose(hs,ui.special)._triggered=null;
+					player.storage.yuhua=hs;
+				}
+				else{
+					event.finish();
+				}
+				'step 1'
+				game.delay();
+			},
+			group:'yuhua2'
+		},
+		yuhua2:{
+			trigger:{player:'phaseDiscardEnd'},
+			forced:true,
+			filter:function(event,player){
+				return player.storage.yuhua?true:false;
+			},
+			content:function(){
+				player.directgain(player.storage.yuhua);
+				delete player.storage.yuhua;
+			}
+		},
 		chenqing:{
 			trigger:{global:'dying'},
 			priority:6,
@@ -3270,7 +3325,12 @@ character.sp={
 		wutugu:'兀突骨',
 		mateng:'马腾',
 		sp_caiwenji:'蔡文姬',
+		zhugeguo:'诸葛果',
 
+		yuhua:'羽化',
+		yuhua_info:'锁定技，弃牌阶段内，你的非基本牌不计入手牌数，且你不能弃置你的非基本牌',
+		qirang:'祈禳',
+		qirang_info:'当有装备牌进入你的装备区时，你可以获得牌堆中的一张锦囊牌',
 		biluan:'避乱',
 		biluan_info:'摸牌阶段开始时，若有其他角色与你距离不大于1，则你可以放弃摸牌。若如此做，其他角色与你距离+X（X为势力数）',
 		lixia:'礼下',

character/swd.js

@@ -9,7 +9,7 @@ character.swd={
 		// swd_miles:['male','qun',4,['aojian','miles_xueyi','mohua2']],
 			swd_nicole:['female','wu',3,['minjing','lingwu','huanjian'],['fullskin']],
 			swd_wangsiyue:['female','wei',3,['duishi','biyue'],['fullskin']],
-		swd_weida:['female','qun',3,['yueren','zhenlie']],
+		// swd_weida:['female','qun',3,['yueren','zhenlie']],
 			swd_xuanyuanjianxian:['male','qun',4,['pozhou','huajian'],['fullskin']],
 
 			swd_chenjingchou:['male','wu',3,['youyin','yihua'],['fullskin']],

character/xswd.js

@@ -3,28 +3,28 @@ character.xswd={
 		// swd_wushi:['male','wei',3,['zhoufu','yingbin','xuying']],
 			// swd_lanmoshen:['female','wei',3,['bingjian','lieren'],['fullskin']],
 			swd_huanglei:['male','qun',3,['jilve','gongshen'],['fullskin']],
-		swd_libai:['female','qun',3,['miaobi','zhexian']],
-		swd_kendi:['male','qun',3,['guanxing','jianyan']],
-		swd_lijing:['male','qun',4,['tianyi','zhuhai']],
-		swd_lilian:['female','qun',3,['swd_wuxie','qingcheng']],
-		swd_linming:['male','qun',3,['shelie','bifa']],
-		swd_philis:['male','qun',4,['yicong','wangxi']],
-		swd_pepin:['male','qun',4,['rejianxiong','quhu']],
+		// swd_libai:['female','qun',3,['miaobi','zhexian']],
+		// swd_kendi:['male','qun',3,['guanxing','jianyan']],
+		// swd_lijing:['male','qun',4,['tianyi','zhuhai']],
+		// swd_lilian:['female','qun',3,['swd_wuxie','qingcheng']],
+		// swd_linming:['male','qun',3,['shelie','bifa']],
+		// swd_philis:['male','qun',4,['yicong','wangxi']],
+		// swd_pepin:['male','qun',4,['rejianxiong','quhu']],
 			swd_kangnalishi:['male','qun',1,['busi','xuying','yinguo'],['fullskin']],
 			swd_xuanyuanjiantong:['male','qun',3,['chengjian','huanling'],['fullskin']],
 		// swd_huiyan:['male','qun',3,['wendao','xiaozhan','xunzhi']],
 
-		swd_chenfu:['male','qun',4,['xuanzhou','bingfeng']],
-		swd_chengyaojin:['male','qun',4,['jiuchi','jufu']],
+		// swd_chenfu:['male','qun',4,['xuanzhou','bingfeng']],
+		// swd_chengyaojin:['male','qun',4,['jiuchi','jufu']],
 			swd_shanxiaoxiao:['female','wu',3,['shehun','xiaomoyu'],['fullskin']],
 			swd_yuchiyanhong:['female','shu',3,['huanxing','meihuo'],['fullskin']],
-		swd_hanteng:['male','qun',4,['kuangfu']],
-		swd_heran:['male','qun',3,['yujian','guiyin','shejie']],
+		// swd_hanteng:['male','qun',4,['kuangfu']],
+		// swd_heran:['male','qun',3,['yujian','guiyin','shejie']],
 		// swd_xingtian:['male','qun',8,[]],
-		swd_qinshubao:['male','qun',3,['huajing','pingxu']],
-		swd_tuobayueer:['female','shu',3,['shushen','biyue']],
-		swd_yangshuo:['male','qun',4,['longdan','luomu']],
-		swd_zhanglie:['male','qun',4,['huajin','poxiao']],
+		// swd_qinshubao:['male','qun',3,['huajing','pingxu']],
+		// swd_tuobayueer:['female','shu',3,['shushen','biyue']],
+		// swd_yangshuo:['male','qun',4,['longdan','luomu']],
+		// swd_zhanglie:['male','qun',4,['huajin','poxiao']],
 
 
 			swd_hanluo:['male','qun',5,['hzhenwei'],['fullskin']],

character/yijiang.js

@@ -5250,9 +5250,9 @@ character.yijiang={
 		zhuran:'朱然',
 		yujin:'于禁',
 		masu:'马谡',
-		xin_masu:'马谡',
+		xin_masu:'新马谡',
 		fazheng:'法正',
-		xin_fazheng:'法正',
+		xin_fazheng:'新法正',
 		wuguotai:'吴国太',
 		chengong:'陈宫',
 		xusheng:'徐盛',
@@ -5270,7 +5270,7 @@ character.yijiang={
 		guyong:'顾雍',
 		jianyong:'简雍',
 		madai:'马岱',
-		xin_xushu:'徐庶',
+		xin_xushu:'新徐庶',
 		manchong:'满宠',
 		liufeng:'刘封',
 		liru:'李儒',

game/game.js

@@ -73,7 +73,6 @@
 					low_performance:{
 						name:'低性能模式',
 						init:false,
-						unfrequent:true,
 						onclick:function(bool){
 							game.saveConfig('low_performance',bool);
 							if(bool){
@@ -264,45 +263,12 @@
 							phone:'移动'
 						},
 						onclick:function(layout){
-							game.saveConfig('layout',layout);
 							if(lib.config.layoutfixed.contains(lib.config.mode)&&layout=='default'){
-								return;
+								game.saveConfig('layout',layout);
+							}
+							else{
+								lib.init.layout(layout);
 							}
-							setTimeout(function(){
-								var layout=ui.css.layout;
-								ui.css.layout=lib.init.css('layout/'+lib.config.layout,'layout',layout);
-								if(lib.config.layout=='mobile'||lib.config.layout=='phone'){
-									ui.arena.classList.add('mobile');
-									if(game.me&&game.me.node.handcards2.childNodes.length){
-										while(game.me.node.handcards2.childNodes.length){
-											game.me.node.handcards1.appendChild(game.me.node.handcards2.firstChild);
-										}
-									}
-								}
-								else{
-									ui.arena.classList.remove('mobile');
-								}
-								if(lib.config.layout=='default'){
-									ui.arena.classList.add('oldlayout');
-								}
-								else{
-									ui.arena.classList.remove('oldlayout');
-								}
-								if(lib.config.layout=='default'&&lib.config.hp_style=='official'){
-									ui.arena.classList.add('hpimage');
-								}
-								else{
-									ui.arena.classList.remove('hpimage');
-								}
-								setTimeout(function(){
-									layout.remove();
-									ui.arena.show();
-									if(game.me) game.me.update();
-									setTimeout(function(){
-										ui.updatex();
-									},500);
-								},100);
-							},500);
 						}
 					},
 					ui_zoom:{
@@ -478,37 +444,37 @@
 						init:false,
 						unfrequent:true,
 					},
-					only_fullskin:{
-						name:'隐藏无全身皮肤武将',
-						init:true,
-						unfrequent:true,
-						restart:true,
-					},
+					// only_fullskin:{
+					// 	name:'隐藏无全身皮肤武将',
+					// 	init:true,
+					// 	unfrequent:true,
+					// 	restart:true,
+					// },
 					hide_card_image:{
 						name:'隐藏卡牌背景',
 						init:false,
 						unfrequent:true,
 						restart:true,
 					},
-					bottom_line:{
-						name:'指示线置底',
-						init:false,
-						unfrequent:true,
-						onclick:function(bool){
-							game.saveConfig('bottom_line',bool);
-							if(lib.config.bottom_line){
-								ui.canvas.style.zIndex=0;
-							}
-							else{
-								ui.canvas.style.zIndex='';
-							}
-						}
-					},
-					line_dash:{
-						name:'虚线指示线',
-						init:false,
-						unfrequent:true,
-					},
+					// bottom_line:{
+					// 	name:'指示线置底',
+					// 	init:false,
+					// 	unfrequent:true,
+					// 	onclick:function(bool){
+					// 		game.saveConfig('bottom_line',bool);
+					// 		if(lib.config.bottom_line){
+					// 			ui.canvas.style.zIndex=0;
+					// 		}
+					// 		else{
+					// 			ui.canvas.style.zIndex='';
+					// 		}
+					// 	}
+					// },
+					// line_dash:{
+					// 	name:'虚线指示线',
+					// 	init:false,
+					// 	unfrequent:true,
+					// },
 					glow_phase:{
 						name:'当前回合角色高亮',
 						init:false,
@@ -958,6 +924,13 @@
 						},
 						clear:true
 					},
+					reset_tutorial:{
+						name:'重置新手向导',
+						onclick:function(){
+							game.saveConfig('new_tutorial',false);
+						},
+						clear:true
+					},
 					import_data:{
 						name:'导入游戏数据',
 						onclick:function(){
@@ -2128,6 +2101,48 @@
 					return script;
 				}
 			},
+			layout:function(layout){
+				game.saveConfig('layout',layout);
+				ui.arena.hide();
+				setTimeout(function(){
+					var layout=ui.css.layout;
+					ui.css.layout=lib.init.css('layout/'+lib.config.layout,'layout',layout);
+					if(lib.config.layout=='mobile'||lib.config.layout=='phone'){
+						ui.arena.classList.add('mobile');
+						if(game.me&&game.me.node.handcards2.childNodes.length){
+							while(game.me.node.handcards2.childNodes.length){
+								game.me.node.handcards1.appendChild(game.me.node.handcards2.firstChild);
+							}
+						}
+					}
+					else{
+						ui.arena.classList.remove('mobile');
+					}
+					if(lib.config.layout=='default'){
+						ui.arena.classList.add('oldlayout');
+					}
+					else{
+						ui.arena.classList.remove('oldlayout');
+					}
+					if(lib.config.layout=='default'&&lib.config.hp_style=='official'){
+						ui.arena.classList.add('hpimage');
+					}
+					else{
+						ui.arena.classList.remove('hpimage');
+					}
+					setTimeout(function(){
+						layout.remove();
+						ui.arena.show();
+						if(game.me) game.me.update();
+						setTimeout(function(){
+							ui.updatex();
+						},500);
+						setTimeout(function(){
+							ui.updatec();
+						},1000);
+					},100);
+				},500);
+			},
 			parse:function(func){
 				var k,func2;
 				var str='(';
@@ -4067,26 +4082,23 @@
 					var info=lib.character[character];
 					var skills=info[3];
 					this.skills.length=0;
-					if(!game.minskin&&lib.isNewLayout()&&info[4].contains('fullskin')){
+					this.classList.add('fullskin');
+					if(!game.minskin&&lib.isNewLayout()){
 						this.classList.remove('minskin');
-						this.classList.add('fullskin');
-						this.node.avatar.setBackground(character,'character',null,'fullskin');
+						this.node.avatar.setBackground(character,'character');
 					}
 					else{
-						if(info[4].contains('fullskin')){
-							this.classList.add('fullskin');
-							this.node.avatar.setBackground(character,'character',null,'fullskin');
-						}
-						else{
-							this.classList.remove('fullskin');
-							this.node.avatar.setBackground(character,'character');
-						}
+						this.node.avatar.setBackground(character,'character');
+
 						if(info[4].contains('minskin')){
 							this.classList.add('minskin');
 						}
 						else if(game.minskin){
 							this.classList.add('minskin');
 						}
+						else{
+							this.classList.remove('minskin');
+						}
 					}
 
 					this.node.avatar.show();
@@ -4120,23 +4132,8 @@
 					}
 					if(character2){
 						var info2=lib.character[character2];
-
-						if(lib.isNewLayout()&&lib.config.only_fullskin){
-							this.classList.add('fullskin2');
-							this.node.avatar2.setBackground(character2,'character',null,'fullskin');
-						}
-						else{
-							if(info2[4].contains('fullskin')){
-								this.classList.add('fullskin2');
-								this.node.avatar2.setBackground(character2,'character',null,'fullskin');
-							}
-							else{
-								this.classList.remove('fullskin2');
-								this.node.avatar2.setBackground(character2,'character');
-							}
-						}
-
-
+						this.classList.add('fullskin2');
+						this.node.avatar2.setBackground(character2,'character');
 
 						this.node.avatar2.show();
 						this.name2=character2;
@@ -5308,6 +5305,7 @@
 						}
 					}
 					for(var i=0;i<cards.length;i++){
+						cards[i].fix();
 						var sort=lib.config.sort_card(cards[i]);
 						if(animate!==false&&!lib.config.low_performance){
 							cards[i].animate('start');
@@ -6190,11 +6188,14 @@
 					node.show();
 
 					node.addEventListener('webkitTransitionEnd',function(){
+						node.style.transitionDuration='0.5s';
+						ui.refresh(node);
 						node.delete();
 					});
 					if(!lib.config.low_performance){
 						setTimeout(function(){
 							node.style.transitionDuration='0.5s';
+							ui.refresh(node);
 							node.hide();
 						},700);
 					}
@@ -9568,7 +9569,8 @@
 			var total=typeof arguments[1]==='number'?arguments[1]:lib.config.duration*2;
 			var opacity=1;
 			var color=[255,255,255];
-			var dashed=lib.config.line_dash;
+			// var dashed=lib.config.line_dash;
+			var dashed=false;
 			if(typeof arguments[1]=='object'){
 				for(var i in arguments[1]){
 					switch(i){
@@ -9636,7 +9638,8 @@
 			var total=typeof arguments[1]==='number'?arguments[1]:lib.config.duration*2;
 			var opacity=1;
 			var color=[255,255,255];
-			var dashed=lib.config.line_dash;
+			// var dashed=lib.config.line_dash;
+			var dashed=false;
 			if(typeof arguments[1]=='object'){
 				for(var i in arguments[1]){
 					switch(i){
@@ -11575,6 +11578,9 @@
 				ui.window.addEventListener(lib.config.touchscreen?'touchend':'click',ui.click.window);
 				ui.system=ui.create.div("#system.",ui.window);
 				ui.arena=ui.create.div('#arena',ui.window);
+				if(!lib.config.new_tutorial&&lib.config.mode=='identity'){
+					ui.arena.classList.add('only_dialog');
+				}
 				if(lib.config.layout=='mobile'||lib.config.layout=='phone'){
 					ui.arena.classList.add('mobile');
 				}
@@ -11600,9 +11606,9 @@
 				ui.sidebar=ui.create.div('#sidebar');
 				ui.sidebar3=ui.create.div('#sidebar3');
 				ui.canvas=document.createElement('canvas');
-				if(lib.config.bottom_line){
-					ui.canvas.style.zIndex=0;
-				}
+				// if(lib.config.bottom_line){
+				// 	ui.canvas.style.zIndex=0;
+				// }
 
 				ui.arena.appendChild(ui.canvas);
 				ui.canvas.id='canvas';
@@ -12588,6 +12594,14 @@
 		                    menuTabBar.style.left=this.offsetLeft+'px';
 		                    menuContent.appendChild(this._link);
 		                };
+						ui.click.menuTab=function(tab){
+							for(var i=0;i<menuTab.childNodes.length;i++){
+								if(menuTab.childNodes[i].innerHTML==tab){
+									clickTab.call(menuTab.childNodes[i]);
+									return;
+								}
+							}
+						};
 		                var pages=[];
 		                for(var i=0;i<tabs.length;i++){
 		                    var active=(i===(config.init||0));
@@ -13777,7 +13791,7 @@
 				}
 				if(lib.config.button_press){
 					node.addEventListener(lib.config.touchscreen?'touchstart':'mousedown',function(e){
-						node.classList.add('pressdown');
+						if(!node.classList.contains('hidden')) node.classList.add('pressdown');
 					});
 					node.addEventListener(lib.config.touchscreen?'touchend':'mouseup',function(e){
 						node.classList.remove('pressdown');
@@ -14941,19 +14955,9 @@
 				img.onerror=function(){
 					delete lib.config.skin[player.name];
 					game.saveConfig('skin',lib.config.skin);
-					if(player.classList.contains('fullskin')){
-						avatar.setBackground(player.name,'character',null,'fullskin');
-					}
-					else{
-						avatar.setBackground(player.name,'character');
-					}
-				}
-				if(player.classList.contains('fullskin')){
-					img.src='image/character/skin/'+player.name+'/'+num+'f.jpg';
-				}
-				else{
-					img.src='image/character/skin/'+player.name+'/'+num+'f.jpg';
+					avatar.setBackground(player.name,'character');
 				}
+				img.src='image/skin/'+player.name+'/'+num+'.jpg';
 			},
 			avatar2:function(){
 				if(!lib.config.change_skin) return;
@@ -14980,19 +14984,9 @@
 				img.onerror=function(){
 					delete lib.config.skin[player.name2];
 					game.saveConfig('skin',lib.config.skin);
-					if(player.classList.contains('fullskin2')){
-						avatar.setBackground(player.name2,'character',null,'fullskin');
-					}
-					else{
-						avatar.setBackground(player.name2,'character');
-					}
-				}
-				if(player.classList.contains('fullskin2')){
-					img.src='image/character/skin/'+player.name2+'/'+num+'f.jpg';
-				}
-				else{
-					img.src='image/character/skin/'+player.name2+'/'+num+'f.jpg';
+					avatar.setBackground(player.name2,'character');
 				}
+				img.src='image/skin/'+player.name2+'/'+num+'.jpg';
 			},
 			player:function(){
 				return ui.click.target.apply(this,arguments);
@@ -17641,11 +17635,15 @@
 			subfolder=subfolder||'default'
 			if(type){
 				if(type=='character'&&lib.config.skin[name]){
-					src='image/character/skin/'+name+'/'+lib.config.skin[name]+
-						(subfolder=='fullskin'?'f':'')+ext;
+					src='image/skin/'+name+'/'+lib.config.skin[name]+ext;
 				}
 				else{
-					src='image/'+type+'/'+subfolder+'/'+name+ext;
+					if(type=='character'){
+						src='image/character/'+name+ext;
+					}
+					else{
+						src='image/'+type+'/'+subfolder+'/'+name+ext;
+					}
 				}
 			}
 			else{
@@ -18184,11 +18182,11 @@
 							if(!character[i][j][k][4]){
 								character[i][j][k][4]=[];
 							}
-							if(lib.config.only_fullskin&&lib.isNewLayout()&&lib.config.mode!='chess'){
-								if(!character[i][j][k][4].contains('fullskin')&&!character[i][j][k][4].contains('minskin')){
-									continue;
-								}
-							}
+							// if(lib.config.only_fullskin&&lib.isNewLayout()&&lib.config.mode!='chess'){
+							// 	if(!character[i][j][k][4].contains('fullskin')&&!character[i][j][k][4].contains('minskin')){
+							// 		continue;
+							// 	}
+							// }
 							if(lib.config.banned.contains(k)){
 								if(lib.config.mode=='chess'&&get.config('chess_mode')=='leader'){
 									lib.hiddenCharacters.push(k);