v1.9.51

character/sp.js

@@ -112,6 +112,9 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 
 			liuye:['male','wei',3,['polu','choulve']],
 			beimihu:['female','qun',3,['zongkui','guju','baijia']],
+
+			// sp_liuqi:['male','qun',3,['wenji','tunjiang']],
+			// luzhi:['male','wei',3,['qingzhong','weijing']],
 		},
 		characterIntro:{
 			huangfusong:'字义真。安定郡朝那县（今宁夏彭阳）人。于黄巾起义时，以中郎将身份讨伐黄巾，用火攻大破张梁、张宝。[45]  后接替董卓进攻张梁，连胜七阵。掘张角墓，拜左车骑将军、冀州牧，因拒绝贿赂宦官而被免职。[46]  董卓死，王允命其与吕布等共至郿坞抄籍董卓家产、人口，皇甫嵩将坞中所藏良家子女，尽行释放。',
@@ -320,6 +323,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			}
 		},
 		skill:{
+			// wenji:{
+			// 	trigger:{player:'phaseUseBegin'},
+
+			// },
+			// tunjiang:{
+
+			// },
 			baijia:{
 				unique:true,
 				ai:{
@@ -9854,7 +9864,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			quyi:'麹义',
 			liuye:'刘晔',
 			beimihu:'卑弥呼',
+			// luzhi:'',
 
+			// qingzhong:'清忠',
+			// qingzhong_info:'出牌阶段开始时，你可以摸两张牌，若如此做，本阶段结束时，你与手牌数最少的角色交换手牌。',
+			// weijing:'卫境',
+			// weijing_info:'每轮限一次，你可以在需要使用【杀】或【闪】时，视为使用一张【杀】或【闪】。',
+			// wenji:'问计',
+			// wenji_info:'出牌阶段开始时，你可以令一名其他角色交给你一张牌。你于本回合内使用与该牌同名的牌不能被其他角色响应。',
+			// tunjiang:'屯江',
+			// tunjiang_info:'结束阶段，若你未跳过本回合的出牌阶段，且你于本回合出牌阶段内未使用牌指定过其他角色为目标，则你可以摸X张牌（X为全场势力数）。',
 			zongkui:'纵傀',
 			zongkui_mark:'纵傀',
 			zongkui_mark_bg:'傀',

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'1.9.50',
+	'1.9.51',
 	'audio/background/music_danji.mp3',
 	'audio/background/music_default.mp3',
 	'audio/background/music_diaochan.mp3',
@@ -1810,6 +1810,7 @@ window.noname_asset_list=[
 	'image/character/liyan.jpg',
 	'image/character/lusu.jpg',
 	'image/character/luxun.jpg',
+	'image/character/luzhi.jpg',
 	'image/character/lvbu.jpg',
 	'image/character/lvmeng.jpg',
 	'image/character/machao.jpg',
@@ -1996,6 +1997,7 @@ window.noname_asset_list=[
 	'image/character/sp_jiangwei.jpg',
 	'image/character/sp_jiaxu.jpg',
 	'image/character/sp_liubei.jpg',
+	'image/character/sp_liuqi.jpg',
 	'image/character/sp_lvmeng.jpg',
 	'image/character/sp_machao.jpg',
 	'image/character/sp_pangde.jpg',

game/directory.js

@@ -88,7 +88,7 @@ get(path.dirname(__dirname),function(){
 		var changes = stdout.split('\n');
 		for(var i=0;i<changes.length;i++){
 			var extname=path.extname(changes[i]);
-			if(!changes[i]||(extname!='.js'&&extname!='.css')){
+			if(!changes[i]||(extname!='.js'&&extname!='.css')||changes[i]=='game/update.js'){
 				changes.splice(i--,1);
 			}
 		}

game/game.js

@@ -7190,7 +7190,11 @@
 					}
 					else{
 						if(confirm('游戏似乎未正常载入，是否重置游戏？')){
+							var onlineKey=localStorage.getItem(lib.configprefix+'key');
 							localStorage.clear();
+							if(onlineKey){
+								localStorage.setItem(lib.configprefix+'key',onlineKey);
+							}
 							if(indexedDB) indexedDB.deleteDatabase(lib.configprefix+'data');
 							setTimeout(function(){
 								window.location.reload();
@@ -22395,6 +22399,7 @@
 					ui.create.connecting(true);
 				},
 				roomlist:function(list,events,clients,wsid){
+					game.send('server','key',game.onlineKey);
 					game.online=true;
 					game.onlinehall=true;
 					lib.config.recentIP.remove(_status.ip);
@@ -22941,6 +22946,12 @@
 						case 'gaming':alert('加入失败：游戏已开始');break;
 						case 'number':alert('加入失败：房间已满');break;
 						case 'banned':alert('加入失败：房间拒绝你加入');break;
+						case 'key':
+							alert('您的游戏版本过低，请升级到最新版');
+							game.saveConfig('tmp_owner_roomId');
+							game.saveConfig('tmp_user_roomId');
+							game.saveConfig('reconnect_info');
+							break;
 						case 'offline':
 						if(_status.paused&&_status.event.name=='game'){
 							setTimeout(game.resume,500);
@@ -39117,14 +39128,6 @@
 		click:{
 			connectEvents:function(){
 				if(this.info){
-					if(!game.onlineKey){
-						game.onlineKey=localStorage.getItem(lib.configprefix+'key');
-						if(!game.onlineKey){
-							game.onlineKey=get.id();
-							localStorage.setItem(lib.configprefix+'key',game.onlineKey);
-						}
-					}
-
 					var button=this;
 					var layer=ui.create.div('.poplayer',ui.window);
 					var uiintro=ui.create.dialog('hidden','notouchscroll');

game/server.js

@@ -72,6 +72,16 @@
 				util.updaterooms();
 			}
 		},
+		key:function(id){
+			clearTimeout(this.keyCheck);
+			delete this.keyCheck;
+			if(bannedKeys.indexOf(id)!=-1){
+				bannedIps.push(this._socket.remoteAddress);
+				console.log(id, this._socket.remoteAddress);
+				this.close();
+				return;
+			}
+		},
 		events:function(cfg,id,type){
 			if(bannedKeys.indexOf(id)!=-1){
 				bannedIps.push(this._socket.remoteAddress);
@@ -268,6 +278,12 @@
 			},500);
 			return;
 		}
+		ws.keyCheck=setTimeout(function(){
+			ws.sendl('denied','key');
+			setTimeout(function(){
+				ws.close();
+			},500);
+		},2000);
 		ws.wsid=util.getid();
 		clients[ws.wsid]=ws;
 		ws.sendl('roomlist',util.getroomlist(),util.checkevents(),util.getclientlist(ws),ws.wsid);

game/update.js

@@ -1,16 +1,20 @@
 window.noname_update={
-	version:'1.9.50.2',
-	update:'1.9.50.1',
+	version:'1.9.51',
+	update:'1.9.50.2',
 	changeLog:[
 		'bug修复'
 	],
-	players:[
-		'beimihu',
-		'zhuran',
-		'zhuzhi'
-	],
+	// players:[
+		// 'sp_liuqi',
+		// 'luzhi'
+	// ],
 	files:[
-		'character/yijiang.js',
+		'character/sp.js',
+		'game/asset.js',
+		'game/directory.js',
 		'game/game.js',
+		'game/server.js',
+		'mode/connect.js',
+		'mode/versus.js'
 	]
 };

mode/connect.js

@@ -143,6 +143,13 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 			else{
 				createNode();
 			}
+			if(!game.onlineKey){
+				game.onlineKey=localStorage.getItem(lib.configprefix+'key');
+				if(!game.onlineKey){
+					game.onlineKey=get.id();
+					localStorage.setItem(lib.configprefix+'key',game.onlineKey);
+				}
+			}
 			_status.connectDenied=createNode;
 			for(var i in lib.element.event){
 				event.parent[i]=lib.element.event[i];

mode/versus.js

@@ -22,6 +22,8 @@ game.import('mode',function(lib,game,ui,get,ai,_status){
 				for(var i in lib.characterPack.mode_versus){
 					lib.character[i]=lib.characterPack.mode_versus[i];
 				}
+				delete lib.character.sp_liuqi;
+				delete lib.character.sp_tangzi;
 				lib.cardPack.mode_versus=['zong','xionghuangjiu','tongzhougongji','lizhengshangyou'];
 				lib.translate.mode_versus_character_config='四国武将';
 			}