Skip to content

phpdts
phpdts
Commit 9afef3a6 authored by hisuinohoshi's avatar hisuinohoshi
Browse files
Options

Merge branch 'waaagh' of https://github.com/hikawiier/phpdts into waaagh

parents fa0e9de1 b03fea15
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 57 deletions
.gitignore
View file @ 9afef3a6
......@@ -89,3 +89,21 @@ daemon*
# 录像文件
records
#
gamedata/adminlog.php
templates/default/lastgb.htm
#Prevent conflicts on deployed server
config.inc.php
#Favicon related files
about.txt
android-chrome-192x192.png
android-chrome-512x512.png
apple-touch-icon.png
favicon-16x16.png
favicon-32x32.png
site.webmanifest
gamedata/adminlog.php
config.inc.php
templates/default/lastgb.htm
command.php
View file @ 9afef3a6
......@@ -142,7 +142,10 @@ if($hp > 0){
$mode = 'command';
//$action = '';
} elseif($mode == 'command') {
if($command == 'move') {
if(!empty($itms0) && !in_array($command, Array('itemget','itm0','dropitm0','split_itm'))){//手里拿着道具的时候否决一切其他命令，防止道具被覆盖！
$log .= "你的双手都已经抓满了东西。为了完成所想，你集中意念召唤幻肢……<br>什么都没有发生，除了你的脑壳痛了起来。<br><br>";
$mode = 'command';
} elseif($command == 'move') {
include_once GAME_ROOT.'./include/game/search.func.php';
move($moveto);
if($coldtimeon){$cmdcdtime=$movecoldtime;}
......@@ -261,7 +264,7 @@ if($hp > 0){
$mode='command';
}
//码语行人提取
} elseif ($sp_cmd == 'sp_extract_trait') {
} elseif ($sp_cmd == 'sp_extract_trait') {
$position = 0;
if ($club == 21) {
foreach (array(1, 2, 3, 4, 5, 6) as $imn)
......
gamedata/adminlog.php
View file @ 9afef3a6
<? if(!defined("IN_GAME")) exit("Access Denied"); ?>
1414530645,Amarillo_NMC,gsedit,10,,,
1414530773,Amarillo_NMC,systemmng,,,,
1414537000,Amarillo_NMC,addgm,別忘了我,9,,
1414537473,別忘了我,systemmng,,,,
1414537500,別忘了我,gamecfgmng,1,,,
1414543238,才不是食物,infomng,,,,
1414547511,才不是食物,editpc,左加明,,,
1414582209,才不是食物,infomng,,,,
1414597500,別忘了我,systemmng,,,,
1414864822,別忘了我,gamecfgmng,1,,,
1416600590,別忘了我,editnpc,班主任 坂持 金发,,,
1416600595,別忘了我,editnpc,花之领主 风见 幽香,,,
1418595029,別忘了我,addgm,請借我錢,7,,
1418737817,請借我錢,killpc,請借我錢,,,
1419479460,請借我錢,killpc,請借我錢,,,
1420317004,別忘了我,systemmng,,,,
1420320898,別忘了我,systemmng,,,,
1422230817,別忘了我,editnpc,思念体-触手众,,,
1422230906,別忘了我,livenpc,思念体-触手众,,,
1424004196,別忘了我,killafker,357,,,
1424004196,別忘了我,killafker,358,,,
1424562266,別忘了我,killafker,359,,,
1424562266,別忘了我,killafker,360,,,
1426276236,別忘了我,gsedit,30,,,
1426276240,別忘了我,gsedit,10,,,
1426277097,別忘了我,systemmng,,,,
1426278707,請借我錢,editnpc,虚子,,,
1426278713,請借我錢,editnpc,红暮,,,
1426278717,請借我錢,wthedit,1,,,
1426278718,請借我錢,hackedit,1,,,
1426278745,請借我錢,editpc,請借我錢,,,
1426278760,請借我錢,editpc,請借我錢,,,
1426278775,請借我錢,editnpc,感觉像蓝凝的东西,,,
1426278917,請借我錢,delcp,請借我錢,,,
1426278924,請借我錢,editnpc,感觉像蓝凝的东西,,,
1426278931,請借我錢,editnpc,红暮,,,
1426278939,請借我錢,editnpc,虚子,,,
1426279124,別忘了我,infomng,,,,
1426281009,別忘了我,killafker,354,,,
1426281014,別忘了我,gsedit,30,,,
1426281017,別忘了我,gsedit,10,,,
1426281028,別忘了我,systemmng,,,,
1689639523,admin,gsedit,20,,,
1689639613,admin,editpc,admin,,,
1689726316,admin,gsedit,20,,,
1689726335,admin,editpc,admin,,,
1689731743,admin,gsedit,20,,,
1689732513,admin,editpc,admin,,,
gamedata/cache/npc_1.php
View file @ 9afef3a6
......@@ -1682,6 +1682,101 @@
),
),
),
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
View file @ 9afef3a6
......@@ -110,8 +110,8 @@ $apose = Array(1,3,4,5,6);
$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=>'红杀将军',
......@@ -137,6 +137,7 @@ $typeinfo = Array(
23=>'使徒',
24=>'巫师',
25=>'佣兵',
26=>'歌神',
88=>'■■',
89=>'残像回声',
90=>'各路党派',
......@@ -161,6 +162,7 @@ $killmsginfo = Array(
15=>'………………RIP.',
18=>'你弱爆了！',
19=>'我赢了。',
26=>'♪你說過在哭泣之後應該可以破涕而笑♪',
89=>'系统弹出，正在计算补正值……',
90=>'你弱爆了！',
91=>'你弱爆了！',
......@@ -286,6 +288,7 @@ $lwinfo = Array(
'胶冻' => '唔，加油捏，不要因为疏忽翻车了呀',
'菌菌子' => '…要画不完了……',
),
26 => '小仓唯唱歌贼!好!听!(寄)',
89 =>'记录设备状态……存档完成！',
90 => '我觉得我还可以抢救一下……',
91 => '我觉得我还可以抢救一下……',
......@@ -849,6 +852,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/cache/style_20190718.css
View file @ 9afef3a6
......@@ -146,6 +146,65 @@ table.infotable th {
.tclan{color:rgb(30, 150, 255); font: bold 10pt "微软雅黑" serif;line-height:16px}
.tmagenta{color:rgb(221, 30, 255); font: bold 10pt "微软雅黑" serif;line-height:16px}
.torange{color:rgb(255, 128, 0); font: bold 10pt "微软雅黑" serif;line-height:16px}
.glitch1 {
font-weight: bold;
text-transform: uppercase;
position: relative;
text-shadow: 0.05em 0 0 #00fffc, -0.03em -0.04em 0 #fc00ff,
0.025em 0.04em 0 #fffc00;
animation: glitch1 725ms infinite;
}
.glitch1 span {
position: absolute;
top: 0;
left: 0;
}
.glitch1 span:first-child {
animation: glitch1 500ms infinite;
clip-path: polygon(0 0, 100% 0, 100% 35%, 0 35%);
transform: translate(-0.04em, -0.03em);
opacity: 0.75;
}
.glitch1 span:last-child {
animation: glitch1 375ms infinite;
clip-path: polygon(0 65%, 100% 65%, 100% 100%, 0 100%);
transform: translate(0.04em, 0.03em);
opacity: 0.75;
}
@keyframes glitch1 {
0% {
text-shadow: 0.05em 0 0 #00fffc, -0.03em -0.04em 0 #fc00ff,
0.025em 0.04em 0 #fffc00;
}
15% {
text-shadow: 0.05em 0 0 #00fffc, -0.03em -0.04em 0 #fc00ff,
0.025em 0.04em 0 #fffc00;
}
16% {
text-shadow: -0.05em -0.025em 0 #00fffc, 0.025em 0.035em 0 #fc00ff,
-0.05em -0.05em 0 #fffc00;
}
49% {
text-shadow: -0.05em -0.025em 0 #00fffc, 0.025em 0.035em 0 #fc00ff,
-0.05em -0.05em 0 #fffc00;
}
50% {
text-shadow: 0.05em 0.035em 0 #00fffc, 0.03em 0 0 #fc00ff,
0 -0.04em 0 #fffc00;
}
99% {
text-shadow: 0.05em 0.035em 0 #00fffc, 0.03em 0 0 #fc00ff,
0 -0.04em 0 #fffc00;
}
100% {
text-shadow: -0.05em 0 0 #00fffc, -0.025em -0.04em 0 #fc00ff,
-0.04em -0.025em 0 #fffc00;
}
}
@keyframes blueflicker {
0%, 18%, 22%, 25%, 53%, 57%, 100% {
......
gamedata/cache/titles_1.php
View file @ 9afef3a6
......@@ -289,7 +289,7 @@ if(!defined('IN_GAME')) exit('Access Denied');
),
# 0. 参展者
0 => Array(
'arb' => '二次元漫展背包', 'arbk' => 'DB', 'arbe' => 2, 'arbs' => 2, 'arbsk' => '^',
'arb' => '二次元漫展背包', 'arbk' => 'DB', 'arbe' => 5, 'arbs' => 5, 'arbsk' => '^',
),
# 66. 叶子钦定！
66 => Array(
......
gamedata/sql/all.sql
View file @ 9afef3a6
......@@ -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
View file @ 9afef3a6
......@@ -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
View file @ 9afef3a6
......@@ -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 '',
......
include/game/elementmix.calc.php
View file @ 9afef3a6
......@@ -568,8 +568,24 @@
if(is_array($obbs)) $obbs = isset($obbs[$itmk]) ? $obbs[$itmk] : $obbs['default'];
if(rand(0,100) > $obbs) continue;
}
//18th fix: kudos to 低维生物
$delsub = $minfo['stuff'];
$count_delsub = count($mnifo['stuff']);
for ($i = 0; $i < count($subtags); $i++){
if (in_array($subtags[$i], $minfo['stuff'])){
unset($subtags[$i]);
$count_delsub -= 1;
if ($count_delsub == 0) break;
}
}
if(array_search($delsub, $subtags)!== false){ //?
# 配对成功！消除素材特征
foreach($minfo['stuff'] as $delsub) unset($subtags[array_search($delsub,$subtags)]);
foreach($minfo['stuff'] as $delsub) unset($subtags[array_search($delsub,$subtags)]);}
//Alternative Fix: This will consume all properties in $subtags that matches $delsub.
//But stacking is better anyways. - comment out the above FOR loop then uncomment this to use
//$subtags = array_diff($subtags, $delsub);
$subtags = array_values($subtags);
# 将组合结果加入属性队列
$sk[] = $minfo['result'];
# 将探索到的次要特征组合加入笔记内
......
include/game/item2.func.php
View file @ 9afef3a6
......@@ -528,6 +528,16 @@ function qianghua($itmn = 0) {
}
addnews ( $now, 'newwep2',$name, $baoshi, $o_itm , $nick);
if ($flag){
# Detect item names that's too long - if so, trigger this easter egg and fix the item name to prevent exploit.
if(mb_strlen($o_itm,'utf-8')>=30){
$log .= "<span class=\"yellow\">突然，有另一把声音插了进来！</span><br>";
$log .= "<span class=\"glitch1\">“我是大魔王昆顿，你们这些中二入脑的英雄们都喜欢将自己的装备名字取得很长，我很生气！<br>就让我毁灭你的中二吧！”</span><br>";
#搞事！
$itm = "★破灭的中二之魂★";
$log .= "<span class=\"yellow\">『你的全身被恐怖感缠绕，只能眼睁睁地看着大魔王将你的中二之魂打成了碎片！<br>但惊异的是，它的性能竟然毫无变化。』</span><br>";
$log .= "<span class=\"glitch1\">“毕竟老夫也不是什么恶魔嘛——那么我的气消了，凯莉你继续吧。”</span><br>";
}
$log .= "<span class=\"yellow\">『一道神圣的闪光照耀在你的眼睛上，当你恢复视力时，发现你的装备闪耀着彩虹般的光芒』</span><br>";
$nzitmlv = $zitmlv +1;
......
include/game/itemmain.func.php
View file @ 9afef3a6
......@@ -1119,7 +1119,14 @@ function itemreduce($item,$mode=0){ //只限合成使用！！
# 素材类道具作合成素材时只消耗耐久
if(preg_match('/^(Y|B|C|X|TN|GB|H|P|V|M)/',$itmk))
{
$itms--;
# Added one additional check to deal with infinite stamina item - destroy it when used in mix.
if($itms == '∞'){
$itms = 0;
$log .= "<span class=\"red\">$itm</span>消失了……它已被";
$itm = $itmk = $itmsk = '';
$itme = $itms = 0;
}else{
$itms--;}
}
# 带有工具属性的道具作合成素材时，不会消耗
elseif(in_array('🧰',get_itmsk_array($itmsk)))
......
templates/default/itemdrop.htm
View file @ 9afef3a6
你想丢掉什么？<br><br>
<input type="hidden" name="mode" value="itemmain">
<input type="radio" name="command" id="menu" value="menu" checked><a onclick=sl('menu'); href="javascript:void(0);" >返回</a>
<!--{if $club==20}-->
<!--{if $club==20 && $clbstatusa != 1}-->
<input type="checkbox" id="split"
onchange="if($('split').checked){$('zz').value='[Z]确定并提炼';for (var i=1; i<=6; i++){if($('itm' + i)){$('itm' + i).value = $('itm' + i).value.replace('dropitm','split_itm');}}}else{$('zz').value='[Z]确定并丢弃';for(var i=1; i<=6; i++){if($('itm' + i)){$('itm' + i).value = $('itm' + i).value.replace('split_itm','dropitm');}}}"><a
onclick=$('split').click(); href="javascript:void(0);">提炼道具</a>
......
templates/default/userwords.htm
View file @ 9afef3a6
......@@ -3,10 +3,10 @@
<tr>
<td>{lang usertitle}</td>
<td>
<select id="nick" name="nick" onchange="var nicklabel=$('nick').options[$('nick').selectedIndex].label;if(''!=nicklabel) $('nickcmt').innerHTML=nicklabel; else $('nickcmt').innerHTML='<br><br><br>';">
<select id="nick" name="nick" onchange="var nicklabel=$('nick').options[$('nick').selectedIndex].getAttribute('comments');if(''!=nicklabel) $('nickcmt').innerHTML=nicklabel; else $('nickcmt').innerHTML='<br><br><br>';">
<!--{loop $nicksrev['nicks'] $val}-->
<!--{eval $title_desc_tmp = str_replace("\r","<br>",$title_desc[$val]['title']);}-->
<option value="{$val}"<!--{if $udata['nick'] == $val}-->selected<!--{/if}--> label="{$title_desc_tmp}">$titles_list[$val]</option>
<option value="{$val}"<!--{if $udata['nick'] == $val}-->selected<!--{/if}--> comments="{$title_desc_tmp}">$titles_list[$val]</option>
<!--{/loop}-->
</select>
<span id="nickcmt">选择一个有趣的头衔，部分头衔存在特殊的入场效果。<br><br><br></span>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment