Merge pull request #186 from winddramon/nachster

消息、聊天等数据库id上限提升、追加歌神NPC

.gitignore

@@ -100,3 +100,6 @@ apple-touch-icon.png
 favicon-16x16.png
 favicon-32x32.png
 site.webmanifest
+gamedata/adminlog.php
+config.inc.php
+templates/default/lastgb.htm

gamedata/cache/npc_1.php

@@ -2539,6 +2539,101 @@ $npcinfo = array
 			),
 		),
 	),
+	26 => array
+		(
+		'mode' => 2,
+		'num' => 1,
+		'pass' => 'gbauibg2',
+		'club' => 0,
+		'bid' => 0,
+		'inf' => '',
+		'rage' => 0,
+		'pose'=> 1,
+		'tactic' => 3,
+		'killnum' => 0,
+		'rp' => 60000,
+		'teamID' => '',
+		'teamPass' => '',
+		'gd' => 'r',
+		'pls' => 34,
+		'mhp' => 8000,
+		'msp' => 8000,
+		'att' => 10000,
+		'def' => 118000,
+		'lvl' => 25,
+		'skill' => 8000,
+		'money' => 1,
+		'arb' => '似乎是把殿下的mtkkk扒了穿上身的白色泳衣',
+		'arbk' => 'DB',
+		'arbe' => 1,
+		'arbs' => 50,
+		'arbsk' => 'A',
+		'arh' => '琪露诺的胖次',
+		'arhk' => 'DH',
+		'arhe' => 1,
+		'arhs' => 50,
+		'arhsk' => 'aI',
+		'arf' => '你怎么知道我在233服5821局唱了两万六千次歌？',
+		'arfk' => 'DF',
+		'arfe' => 1,
+		'arfs' => 50,
+		'arfsk' => 'h',
+		'ara' => '印着【驱寒颂歌】的歌词卡模样的杏仁豆腐',
+		'arak' => 'DA',
+		'arae' => 1,
+		'aras' => 50,
+		'arask' => 'z',
+		'art' => '快！说！小！仓！唯！唱！歌！贼！好！听！',
+		'artk' => 'A',
+		'arte' => 1,
+		'arts' => 1,
+		'artsk' => 'H',
+		'sub' => array
+		(
+			0 => array
+			(
+			'name' => 'mtkkk',
+			'gd' => 'f',
+			'icon' => 109,
+			'club' => 15,
+			'wep' => '冰符『Icicle Fall』',
+			'wepk' => 'WF',
+			'wepe' => 9,
+			'weps' => '∞',
+			'wepsk' => 'ri',
+			'itm1' => '我在翻录像的时候发现以前的我在说蕾薇希雅很色',
+			'itmk1' => 'X',
+			'itme1' => 1,
+			'itms1' => 1,
+			'itmsk1' => '',
+			'itm2' => '我的下议会用了五秒的时间回想，蕾薇希雅确实色',
+			'itmk2' => 'X',
+			'itme2' => 1,
+			'itms2' => 1,
+			'itmsk2' => '',
+			'itm3' => '但是，现在的我觉得小草神更色',
+			'itmk3' => 'X',
+			'itme3' => 1,
+			'itms3' => 1,
+			'itmsk3' => '',
+			'itm4' => '纳西妲真是太对我叉批辣，我好想和小草神■■■',
+			'itmk4' => 'X',
+			'itme4' => 1,
+			'itms4' => 1,
+			'itmsk4' => '',
+			'itm5' => '但是那个小草支线写的什么勾八，写的人赶紧去死吧',
+			'itmk5' => 'X',
+			'itme5' => 1,
+			'itms5' => 1,
+			'itmsk5' => '',
+			'itm6' => '■饱含篝酱怨念的音波搅拌特制篝酱■',
+			'itmk6' => 'PM2',
+			'itme6' => 120,
+			'itms6' => 5,
+			'itmsk6' => 'V',
+			),
+		),
+	),
 
 	88 => array
 		(

gamedata/cache/resources_1.php

@@ -103,8 +103,8 @@ $apose = Array(1,3,4,5,6,8);
 $atac = Array(2,3,4);
 //不会生成在危险地图的NPC（执行官、女主）
 $hidding_typelist = Array(7,14);
-//不会因躲避禁区、追杀玩家等原因离开地图的NPC（红暮、■、执行官、英灵（没有巫师）、SCP、种火）
-$sentinel_typelist = Array(1,4,7,9,13,20,21,22,88,92);
+//不会因躲避禁区、追杀玩家等原因离开地图的NPC（红暮、■、执行官、英灵（没有巫师）、歌神、SCP、种火）
+$sentinel_typelist = Array(1,4,7,9,13,20,21,22,26,88,92);
 $typeinfo = Array(
 	0=>'参战者',
 	1=>'红杀将军',
@@ -130,6 +130,7 @@ $typeinfo = Array(
 	23=>'使徒',
 	24=>'巫师',
 	25=>'佣兵',
+	26=>'歌神',
 	88=>'■■',
 	89=>'残像回声',
 	90=>'各路党派',
@@ -154,6 +155,7 @@ $killmsginfo = Array(
 	15=>'………………RIP.',
 	18=>'你弱爆了！',
 	19=>'我赢了。',
+	26=>'♪你說過在哭泣之後應該可以破涕而笑♪',
 	89=>'系统弹出，正在计算补正值……',
 	90=>'你弱爆了！',
 	91=>'你弱爆了！',
@@ -279,6 +281,7 @@ $lwinfo = Array(
 		'胶冻' => '唔，加油捏，不要因为疏忽翻车了呀',
 		'菌菌子' => '…要画不完了……',
 	),
+	26 => '小仓唯唱歌贼!好!听!(寄)',
 	89 =>'记录设备状态……存档完成！',
 	90 => '我觉得我还可以抢救一下……',
 	91 => '我觉得我还可以抢救一下……',
@@ -842,6 +845,25 @@ $npcchat = Array(
 			'color' => 'spitem2'
 		),
 	),
+	26 => Array(
+		'mtkkk' => Array(
+			0 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//meet
+			1 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//attackfine
+			2 => '“快说小仓唯唱歌贼好听！”',
+			3 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
+			4 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
+			5 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//defendfine
+			6 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
+			7 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//defendhurt
+			8 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',
+			9 => '“小仓唯唱歌贼!好!听!(寄)”',//retreat
+			10 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//can't counterattack
+			11 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//out of range
+			12 => '“🥵该发言因过于逆天已被系统自动屏蔽🥵”',//critical
+			13 => '♪你說過在哭泣之後應該可以破涕而笑♪',	
+			'color' => 'yellow'
+		),
+	),
 	92 => Array(
 		'✦覆唱的篝火' => Array(
 			0 => '“Щдвц вц щдψ Йжρψцщαт жω Тψωтαвх, Цвμхвхμ вх!”',

gamedata/sql/all.sql

@@ -23,7 +23,7 @@ DROP TABLE IF EXISTS `acbra2_chat`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `acbra2_chat` (
-  `cid` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `cid` mediumint unsigned NOT NULL AUTO_INCREMENT,
   `type` enum('0','1','2','3','4','5') NOT NULL DEFAULT '0',
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   `send` char(24) NOT NULL DEFAULT '',
@@ -156,7 +156,7 @@ DROP TABLE IF EXISTS `acbra2_newsinfo`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `acbra2_newsinfo` (
-  `nid` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
+  `nid` mediumint unsigned NOT NULL AUTO_INCREMENT,
   `time` int(10) unsigned NOT NULL DEFAULT '0',
   `news` char(15) NOT NULL DEFAULT '',
   `a` varchar(255) NOT NULL DEFAULT '',

gamedata/sql/chat.sql

@@ -5,7 +5,7 @@
 
 DROP TABLE IF EXISTS bra_chat;
 CREATE TABLE bra_chat (
-  cid smallint unsigned NOT NULL auto_increment,
+  cid mediumint unsigned NOT NULL auto_increment,
   type enum('0','1','2','3','4','5') NOT NULL default '0',
  `time` int(10) unsigned NOT NULL default '0',
   send char(24) NOT NULL default '',

gamedata/sql/newsinfo.sql

@@ -5,7 +5,7 @@
 
 DROP TABLE IF EXISTS bra_newsinfo;
 CREATE TABLE bra_newsinfo (
-  nid smallint unsigned NOT NULL auto_increment,
+  nid mediumint unsigned NOT NULL auto_increment,
  `time` int(10) unsigned NOT NULL default '0',
  `news` char(15) NOT NULL default '',
  `a` varchar(255) NOT NULL default '',