The day I become a GOD!!!!!!

庆祝《成神之日》开播！！！

character/sp.js

@@ -309,7 +309,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					'step 1'
 					if(target.countCards('h')&&event.list.length){
 						event.current=event.list.shift();
-						event.current.gainPlayerCard(target,true);
+						event.current.gainPlayerCard(target,true,'h');
 						target.line2([event.current,player]);
 					}
 					else{
@@ -15312,7 +15312,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			yidian:'佚典',
 			yidian_info:'当你使用牌选择目标时，若弃牌堆中没有与此牌名称相同的牌，则你可以为此牌增加一个目标（无距离限制）。',
 			xinlianji:'连计',
-			xinlianji_info:'出牌阶段限一次，你可以弃置一张手牌，令其使用牌堆中的一张随机武器牌，然后选择一项：对你指定的一名角色使用【杀】，或令你将其装备区里的武器牌交给任意角色。',
+			xinlianji_info:'出牌阶段限一次，你可以弃置一张手牌，令一名角色使用牌堆中的一张随机武器牌。然后其选择一项：对你指定的一名角色使用一张【杀】，或令你将其装备区里的武器牌交给任意角色。',
 			xinmoucheng:'谋逞',
 			xinmoucheng_info:'觉醒技，准备阶段，若你已经发动了3次以上的〖连计〗，则你失去〖连计〗并获得〖矜功〗。',
 			xinjingong:'矜功',

character/sp2.js

@@ -387,7 +387,6 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			moying2:{},
 			juanhui:{
 				audio:2,
-				charlotte:true,
 				trigger:{player:'phaseJieshuBegin'},
 				direct:true,
 				content:function(){
@@ -407,6 +406,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				},
 			},
 			juanhui2:{
+				charlotte:true,
 				mark:true,
 				intro:{
 					markcount:function(storage,player){
@@ -3143,9 +3143,11 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 				silent:true,
 				firstDo:true,
 				filter:function(event,player){
-					if(!lib.skill[event.skill]) return false;
+					var info=lib.skill[event.skill];
+					if(!info) return false;
 					if(event.skill==player.storage.pingjian_temp) return true;
-					if(lib.skill[event.skill].sourceSkill==player.storage.pingjian_temp) return true;
+					if(info.sourceSkill==player.storage.pingjian_temp||info.group==player.storage.pingjian_temp) return true;
+					if(Array.isArray(info.group)&&info.group.contains(player.storage.pingjian_temp)) return true;
 					return false;
 				},
 				content:function(){
@@ -5365,7 +5367,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 			lisu:'李肃',
 			zhangwen:'张温',
 			puyuan:'蒲元',
-			xushao:'许邵',
+			xushao:'许劭',
 			mangyachang:"忙牙长",
 			xugong:"许贡",
 			zhangchangpu:"张昌蒲",

game/asset.js

@@ -1,5 +1,5 @@
 window.noname_asset_list=[
-	'v1.9.105.1',
+	'v1.9.105.2',
 	'audio/background/aozhan_chaoming.mp3',
 	'audio/background/aozhan_online.mp3',
 	'audio/background/aozhan_rewrite.mp3',
@@ -5217,7 +5217,7 @@ window.noname_skin_list={
 	key_nao:3,
 	key_shiki:4,
 	key_yui:2,
-	key_yuri:3,
+	key_yuri:4,
 	key_yuzuru:2,
 	sp_key_kanade:1,
 	key_kamome:1,

game/game.js

@@ -15628,7 +15628,6 @@
 						if(left===right) n=Math.min(n,length-n);
 						else if(left==true) n=length-n;
 					}
-  
 					n=game.checkMod(from,to,n,'globalFrom',from);
 					n=game.checkMod(from,to,n,'globalTo',to);
 					m=n;
@@ -17737,6 +17736,7 @@
 					if(next.ai==undefined) next.ai=function(){return 1};
 					next.setContent('chooseButton');
 					next._args=Array.from(arguments);
+					next.forceDie=true;
 					return next;
 				},
 				chooseButtonOL:function(list,callback,ai){
@@ -17894,6 +17894,7 @@
 					if(next.ai==undefined) next.ai=get.attitude2;
 					next.setContent('chooseTarget');
 					next._args=Array.from(arguments);
+					next.forceDie=true;
 					return next;
 				},
 				chooseCardTarget:function(choose){
@@ -17986,6 +17987,7 @@
 					if(next.choice==undefined) next.choice=0;
 					next.setContent('chooseControl');
 					next._args=Array.from(arguments);
+					next.forceDie=true;
 					return next;
 				},
 				chooseBool:function(){
@@ -18008,6 +18010,7 @@
 					next.player=this;
 					next.setContent('chooseBool');
 					next._args=Array.from(arguments);
+					next.forceDie=true;
 					return next;
 				},
 				chooseDrawRecover:function(){
@@ -25767,7 +25770,8 @@
 						game.ip=get.trimip(_status.ip);
 						for(var i=0;i<list.length;i++){
 							var player=ui.create.player(ui.window).animate('start');
-							player.dataset.position='c'+i;
+							if(list.length==8) player.dataset.position=i.toString();
+							else player.dataset.position='c'+i;
 							player.classList.add('connect');
 							player.roomindex=i;
 							player.node.hp.classList.add('room');
@@ -25893,7 +25897,7 @@
 				updaterooms:function(list,clients){
 					if(ui.rooms){
 						ui.window.classList.add('more_room');
-						var list2=['re_caocao','re_liubei','re_sunquan','re_zhangjiao','ol_yuanshao','ol_dongzhuo'];
+						var list2=['re_caocao','re_liubei','re_sunquan','re_zhangjiao','re_caopi','ol_liushan','re_sunce','ol_yuanshao'];
 						for(var i=0;i<ui.rooms.length;i++){
 							ui.rooms[i].initRoom(list[i],list2[i]);
 						}
@@ -25913,7 +25917,7 @@
 					if(events&&ui.connectEvents){
 						ui.connectEvents.info=events;
 						var num=events.filter(function(evt){
-							return evt.creator==game.onlineKey||!get.is.banWords(evt.content)
+							return typeof evt.creator=='string'&&(evt.creator==game.onlineKey||!get.is.banWords(evt.content))
 						}).length;
 						if(num){
 							ui.connectEventsCount.innerHTML=num;
@@ -25935,6 +25939,9 @@
 					else if(reason=='time'){
 						str+='，时间已过';
 					}
+					else if(reason=='ban'){
+						str+='，请注意文明发言';
+					}
 					alert(str);
 				},
 				init:function(id,config,ip,servermode,roomId){
@@ -43396,7 +43403,7 @@
 											}
 										}
 									});
- 							},uiintro.content,3);
+								},uiintro.content,4);
 								var fakeinfo={
 									utc:utc,
 									day:parseInt(daysselect.value),
@@ -43450,6 +43457,7 @@
 								if(fakeinfo.members.contains(game.onlineKey)){
 									eventnode.classList.add('active');
 								}
+								button.input.value='';
 								return;
 							}
 							game.send('server','events',{
@@ -43464,12 +43472,13 @@
 
 						var num=0;
 						for(var i=0;i<button.info.length;i++){
-							if(button.info[i].creator!=game.onlineKey&&get.is.banWords(button.info[i].content)) continue;
+							if(typeof button.info[i].creator=='string'&&button.info[i].creator!=game.onlineKey&&get.is.banWords(button.info[i].content)) continue;
-							if(button.info[i].creator==game.onlineKey&&button.info[i].members.contains(game.onlineKey)){
+							if(button.info[i].creator==game.onlineKey){
 								num++;
 							}
 							var eventnode=ui.create.div('.menubutton.videotext.onlineevent.pointerdiv',function(){
 								var that=this;
+								if(typeof that.info.creator!='string') return;
 								setTimeout(function(){
 									if(that.classList.contains('active')){
 										if(confirm('确定要离开'+that.info.content+'？')){
@@ -43484,6 +43493,7 @@
 								});
 							},uiintro.content);
 							eventnode.info=button.info[i];
+							if(typeof button.info[i].creator=='string'){
 								ui.create.div('.title',button.info[i].content,eventnode);
 								var str;
 								if(button.info[i].day<currentDay){
@@ -43529,6 +43539,12 @@
 									eventnode.classList.add('active');
 								}
 							}
+							else{
+								ui.create.div('.title',button.info[i].title,eventnode);
+								ui.create.div('',button.info[i].content,eventnode);
+								ui.create.div('','创建者：'+(button.info[i].nickname),eventnode);
+							}
+						}
 						if(num>=3){
 							button.input.disabled=true;
 							button.input.style.opacity=0.6;
@@ -43642,6 +43658,8 @@
 							else{
 								ui.create.div('.name','<span style="opacity:0.6">'+(button.info[i][0]||'无名玩家'),node);
 							}
+							//ui.create.div('.videostatus',node,button.info[i][5]);
+							//node.classList.add('videonodestatus');
 							if(button.info[i][3]){
 								ui.create.div('.videostatus',node,button.info[i][3].slice(0,80));
 								node.classList.add('videonodestatus')

game/keyWords.js

@@ -1,3 +1,3 @@
 window.bannedKeyWords=[
-'ghs','直肠','性交','做爱','http','吃奶','骚逼','哈巴狗','美眉','癌','屁眼','艹','傻逼','操你','做鸡','奸','姦','华为','屄','狗子','屎','同性恋','肖战','鸡巴','精液','粪水','挂月亮中','贱骨头',
+'ghs','直肠','性交','做爱','http','吃奶','骚逼','哈巴狗','美眉','癌','屁眼','艹','傻逼','操你','做鸡','奸','姦','华为','屄','狗子','屎','同性恋','肖战','鸡巴','精液','粪水','挂月亮中','贱骨头','吃屁',
 ];

game/server.js

@@ -4,9 +4,16 @@
 	var bannedKeys=[];
 	var bannedIps=[];
 
-	var rooms=[{},{},{},{},{},{}];
+	var rooms=[{},{},{},{},{},{},{},{}];
-	var events=[];
+	var systemEvent={
+		content:'公告内容',
+		avatar:'key_yuri',
+		nickname:'系统管理员',
+		title:'系统公告',
+	};
+	var events=[systemEvent];
 	var clients={};
+	var bannedKeyWords=['ghs','直肠','性交','做爱','http','吃奶','骚逼','哈巴狗','美眉','癌','屁眼','艹','傻逼','操你','做鸡','奸','姦','华为','屄','狗子','屎','同性恋','肖战','鸡巴','精液','粪水','挂月亮中','贱骨头','吃屁'];
 	var messages={
 		enter:function(index,nickname,avatar,config,mode){
 			this.nickname=nickname;
@@ -73,9 +80,10 @@
 			}
 		},
 		key:function(id){
+			this.onlineKey=id;
 			clearTimeout(this.keyCheck);
 			delete this.keyCheck;
-			if(bannedKeys.indexOf(id)!=-1){
+			if(typeof id!='string'||bannedKeys.indexOf(id)!=-1){
 				bannedIps.push(this._socket.remoteAddress);
 				console.log(id, this._socket.remoteAddress);
 				this.close();
@@ -83,7 +91,7 @@
 			}
 		},
 		events:function(cfg,id,type){
-			if(bannedKeys.indexOf(id)!=-1){
+			if(bannedKeys.indexOf(id)!=-1||typeof id!='string'){
 				bannedIps.push(this._socket.remoteAddress);
 				console.log(id, this._socket.remoteAddress);
 				this.close();
@@ -124,13 +132,18 @@
 					else if(cfg.utc<=time){
 						this.sendl('eventsdenied','time');
 					}
+					else if(util.isBanned(cfg.content)){
+						this.sendl('eventsdenied','ban');
+					}
 					else{
 						cfg.nickname=cfg.nickname||'无名玩家';
 						cfg.avatar=cfg.nickname||'caocao';
 						cfg.creator=id;
 						cfg.id=util.getid();
 						cfg.members=[id];
+						events.splice(0,1);
 						events.unshift(cfg);
+						events.unshift(systemEvent);
 						changed=true;
 					}
 				}
@@ -182,6 +195,12 @@
 		},
 	};
 	var util={
+		isBanned:function(str){
+			for(var i of bannedKeyWords){
+				if(str.indexOf(i)!=-1) return true;
+			}
+			return false;
+		},
 		sendl:function(){
 			var args=[];
 			for(var i=0;i<arguments.length;i++){
@@ -228,7 +247,7 @@
 		getclientlist:function(){
 			var clientlist=[];
 			for(var i in clients){
-				clientlist.push([clients[i].nickname,clients[i].avatar,!clients[i].room,clients[i].status,clients[i].wsid]);
+				clientlist.push([clients[i].nickname,clients[i].avatar,!clients[i].room,clients[i].status,clients[i].wsid,clients[i].onlineKey]);
 			}
 			return clientlist;
 		},

game/update.js

@@ -1,8 +1,8 @@
 window.noname_update={
-	version:'1.9.105.1',
+	version:'1.9.105.2',
-	update:'1.9.105',
+	update:'1.9.105.1',
 	changeLog:[
-		'松下护騨',
+		'庆祝《成神之日》开播！联机服务器全新升级！',
 		'bug修复',
 		
 	],
@@ -10,7 +10,7 @@ window.noname_update={
 		//'card/extra.js',
 		//'card/huanlekapai.js',
 		//'card/sp.js',
-		'card/standard.js',
+		//'card/standard.js',
 		//'card/swd.js',
 		//'card/mtg.js',
 		//'card/gujian.js',
@@ -19,17 +19,17 @@ window.noname_update={
 		//'card/yunchou.js',
 		//'card/zhenfa.js',
 		//'card/zhulu.js',
-		'character/diy.js',
+		//'character/diy.js',
 		//'character/extra.js',
 		//'character/hearth.js',
 		//'character/gujian.js',
 		//'character/gwent.js',
         //'character/hearth.js',
-		'character/mobile.js',
+		//'character/mobile.js',
 		//'character/mtg.js',
 		//'character/old.js',
-		'character/refresh.js',
+		//'character/refresh.js',
-		'character/shenhua.js',
+		//'character/shenhua.js',
 		'character/sp.js',
 		'character/sp2.js',
 		//'character/tw.js',
@@ -37,25 +37,26 @@ window.noname_update={
 		//'character/swd.js',
 		//'character/xianjian.js',
 		//'character/xinghuoliaoyuan.js',
-		'character/yijiang.js',
+		///'character/yijiang.js',
 		//'character/yxs.js',
 		//'extension/boss/extension.js',
 		//'layout/default/layout.css',
 		//'layout/nova/layout.css',
 		//'mode/identity.js',
 		//'mode/doudizhu.js',
-		'mode/guozhan.js',
+		//'mode/guozhan.js',
 		//'mode/chess.js',
 		//'mode/tafang.js',
 		//'mode/single.js',
 		//'mode/stone.js',
 		//'mode/brawl.js',
 		//'mode/versus.js',
-		'mode/boss.js',
+		//'mode/boss.js',
 		'game/game.js',
 		'game/keyWords.js',
+		'game/server.js',
 		//'game/NoSleep.js',
-		'game/config.js',
+		//'game/config.js',
 		//'game/package.js',
 		//'game/asset.js',
 		//'game/source.js',