Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
phpdts
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Nemo Ma
phpdts
Commits
35092579
Commit
35092579
authored
Jan 08, 2022
by
Nemo Ma
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
4a7e2609
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
274 deletions
+10
-274
gamedata/cache/mixitem_1.php
gamedata/cache/mixitem_1.php
+3
-3
include/game.js
include/game.js
+5
-1
include/game.js_
include/game.js_
+0
-269
include/game/itemmain.func.php
include/game/itemmain.func.php
+2
-1
No files found.
gamedata/cache/mixitem_1.php
View file @
35092579
...
...
@@ -22,6 +22,7 @@ $mixinfo = array
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'针筒'
,
'毒药'
),
'result'
=>
array
(
'毒针'
,
'WK'
,
32
,
20
,
'p'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'毒针'
,
'毒针'
),
'result'
=>
array
(
'D.毒针'
,
'WK'
,
48
,
20
,
'p'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'D.毒针'
,
'D.毒针'
,
'D.毒针'
),
'result'
=>
array
(
'D.D.D'
,
'WK'
,
80
,
20
,
'pN'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'西瓜'
,
'水果刀'
,
'磨刀石'
),
'result'
=>
array
(
'西瓜刀'
,
'WK'
,
99
,
'∞'
,
'c'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'白色的羽毛'
,
'白色的羽毛'
,
'白色的羽毛'
,
'白色的羽毛'
,
'白色的羽毛'
),
'result'
=>
array
(
'纯白片翼'
,
'WK'
,
150
,
200
,
'ia'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'白色的羽毛'
,
'闪耀的羽毛'
,
'彩虹光芒的羽毛'
,
'翼人的羽毛'
),
'result'
=>
array
(
'悲叹片翼'
,
'WK'
,
3200
,
200
,
'ai'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'白色的羽毛'
,
'凤凰之羽'
,
'露琪亚之羽'
,
'绿宝石方块'
),
'result'
=>
array
(
'精灵片翼'
,
'WK'
,
300
,
200
,
'uid'
),),
...
...
@@ -43,7 +44,8 @@ $mixinfo = array
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'☆金属拳套☆'
,
'压缩气罐'
,
'★RPG-7★'
),
'result'
=>
array
(
'☆简易火箭飞拳☆'
,
'WP'
,
160
,
'100'
,
'cd'
),),
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'☆简易火箭飞拳☆'
,
'电磁发射装置'
),
'result'
=>
array
(
'★火箭飞拳★'
,
'WP'
,
600
,
500
,
'cdN'
),),
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'《哲♂学》'
,
'小棍棒'
,
'增幅设备'
),
'result'
=>
array
(
'森之妖精的棍棒'
,
'WP'
,
200
,
60
,
're'
),),
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'☆法式长棍面包☆'
,
'水'
),
'result'
=>
array
(
'法式面包棍棒'
,
'WP'
,
120
,
60
,
'NRz'
),),
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'冰沙'
,
'小棍棒'
,
'御神签'
),
'result'
=>
array
(
'冰棍棒'
,
'WP'
,
19
,
29
,
'r'
),),
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'☆法式长棍面包☆'
,
'水'
),
'result'
=>
array
(
'法式面包棍棒'
,
'WP'
,
120
,
25
,
'NRz'
),),
array
(
'class'
=>
'wg'
,
'stuff'
=>
array
(
'火把'
,
'红宝石方块'
,
'某种电子零件'
),
'result'
=>
array
(
'『红石电路』'
,
'X'
,
1
,
1
,
''
),),
array
(
'class'
=>
'wg'
,
'stuff'
=>
array
(
'『环形激光』'
,
'『红石电路』'
,
'原型武器G'
),
'result'
=>
array
(
'『红石光束炮』'
,
'WG'
,
280
,
280
,
'udo'
),),
...
...
@@ -184,8 +186,6 @@ $mixinfo = array
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'空白符卡'
,
'《文文。新闻》'
),
'result'
=>
array
(
'风符『风神一扇』'
,
'WF'
,
200
,
'∞'
,
'd'
),),
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'空白符卡'
,
'★制御棒★'
,
'向日葵'
),
'result'
=>
array
(
'『地狱的人造太阳』'
,
'WF'
,
522
,
'∞'
,),),
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'空白符卡'
,
'冰冻青蛙'
,
'バカ⑨制冰块'
),
'result'
=>
array
(
'冰符『Icicle Fall』'
,
'WF'
,
9
,
'∞'
,
'ir'
),),
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'西瓜'
,
'水果刀'
,
'磨刀石'
),
'result'
=>
array
(
'西瓜刀'
,
'WK'
,
99
,
'∞'
,
'c'
),),
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'冰沙'
,
'小棍棒'
,
'御神签'
),
'result'
=>
array
(
'冰棍棒'
,
'WP'
,
19
,
29
,
'r'
),),
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'冰符『Icicle Fall』'
,
'西瓜刀'
,
'冰棍棒'
),
'result'
=>
array
(
'曾经的荣光-深蓝'
,
'WF'
,
99
,
'∞'
,
'cri'
),),
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'空白符卡'
,
'【触手的萃取液】'
,
'《东方永夜抄》'
),
'result'
=>
array
(
'紫奥义『弹幕结界』'
,
'WF'
,
320
,
'∞'
,
'rd'
),),
array
(
'class'
=>
'wf'
,
'stuff'
=>
array
(
'时符『Private Square』'
,
'幻之刃'
,
'永恒飞刃'
,
'银色方块'
),
'result'
=>
array
(
'『咲夜的世界』'
,
'WF'
,
150
,
'∞'
,
'irc'
),),
...
...
include/game.js
View file @
35092579
...
...
@@ -275,6 +275,10 @@ function showData(sdata){
if
(
shwData
[
'
timer
'
]
&&
typeof
(
timerid
)
==
'
undefined
'
){
demiSecTimerStarter
(
shwData
[
'
timer
'
]);
}
if
(
$
(
'
HsUipfcGhU
'
))
//ˢ��ҳ����
{
window
.
location
.
reload
();
}
}
var
refchat
=
null
;
...
...
@@ -333,4 +337,4 @@ function openShutManager(oSourceObj,oTargetObj,shutAble,oOpenTip,oShutTip){
}
}
//1
\ No newline at end of file
//1
include/game.js_
deleted
100644 → 0
View file @
4a7e2609
function hotkey(evt)
{
if(document.activeElement.tagName != 'INPUT'){
evt = (evt) ? evt : ((window.event) ? window.event : '');
var ky = evt.keyCode ? evt.keyCode : evt.which;
if(!evt.ctrlKey && !evt.altKey && !evt.shiftKey){
if(ky==90){
$('submit').click();
}
}
}
}
//update time
function updateTime(timing,mode)
{
if(timing){
t = timing;
tm = mode;
h = Math.floor(t/3600);
m = Math.floor((t%3600)/60);
s = t%60;
// add a zero in front of numbers<10
h=checkTime(h);
m=checkTime(m);
s=checkTime(s);
$('timing').innerHTML = h + ':' + m + ':' +s;
tm ? t++ : t--;
setTimeout("updateTime(t,tm)",1000);
}
else{
window.location.reload();
}
}
function demiSecTimer(){
if($('timer') && ms>=itv) {
ms -= itv;
var sec = Math.floor(ms/1000);
var dsec = Math.floor((ms%1000)/100);
$('timer').innerHTML = sec + '.' + dsec;
} else {
clearInterval(timerid);
delete timerid;
}
}
function demiSecTimerStarter(msec){
itv = 100;//by millisecend
ms = msec;
timerid = setInterval("demiSecTimer()",itv);
}
//icon select
function iconMover(){
gd = document.valid.gender[0].checked ? 'm' : 'f';
inum = document.valid.icon.selectedIndex;
$('iconImg').innerHTML = '<img src="img/' + gd + '_' + inum + '.gif" alt="' + inum + '">';
}
function userIconMover(){
ugd = $('male').checked ? 'm' : 'f';
uinum = $('icon').selectedIndex;
$('userIconImg').innerHTML = '<img src="img/' + ugd + '_' + uinum + '.gif" alt="' + uinum + '">';
}
function dniconMover(){
dngd = document.cmd.dngender[0].checked ? 'm' : 'f';
dninum =document.cmd.dnicon.selectedIndex;
$('dniconImg').innerHTML = '<img src="img/' + dngd + '_' + dninum + '.gif" alt="' + dninum + '">';
}
function showNotice(sNotice) {
$('notice').innerText = sNotice;
}
function sl(id) {
$(id).checked = true;
}
function postCommand(){
$('submit').disabled = true;
var oXmlHttp = zXmlHttp.createRequest();
var sBody = getRequestBody(document.forms['cmd']);
oXmlHttp.open("post", "command.php", true);
oXmlHttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
oXmlHttp.onreadystatechange = function () {
if (oXmlHttp.readyState == 4) {
if (oXmlHttp.status == 200) {
showGamedata(oXmlHttp.responseText);
$('submit').disabled = false;
} else {
showNotice(oXmlHttp.statusText);
}
}
};
oXmlHttp.send(sBody);
}
function showGamedata(sGamedata){
gamedata = sGamedata.parseJSON();
if(gamedata['url']) {
window.location.href = gamedata['url'];
} else if(!gamedata['main']) {
window.location.href = 'index.php';
}
//timer = 0;
for(var id in gamedata) {
if(id == 'toJSONString' || id == 'timer') {
continue;
} else if(gamedata[id]){
if(id == 'team'){
$('team').value = gamedata['team'];
}else{
$(id).innerHTML = gamedata[id];
}
} else{
$(id).innerHTML = '';
}
}
if(gamedata['timer'] && typeof(timerid)=='undefined'){
demiSecTimerStarter(gamedata['timer']);
}
}
function postRegCommand(){
$('post').disabled = true;
$('reset').disabled = true;
var oXmlHttp = zXmlHttp.createRequest();
var sBody = getRequestBody(document.forms['reg']);
oXmlHttp.open("post", "register.php", true);
oXmlHttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
oXmlHttp.onreadystatechange = function () {
if (oXmlHttp.readyState == 4) {
if (oXmlHttp.status == 200) {
$('post').disabled = false;
$('reset').disabled = false;
showRegdata(oXmlHttp.responseText);
} else {
showNotice(oXmlHttp.statusText);
}
}
};
oXmlHttp.send(sBody);
}
function showRegdata(sRegdata){
regdata = sRegdata.parseJSON();
for(var id in regdata) {
if(id == 'toJSONString') {
continue;
} else if(regdata[id]){
$(id).innerHTML = regdata[id];
} else{
$(id).innerHTML = '';
}
}
}
function showNews(n){
var oXmlHttp = zXmlHttp.createRequest();
oXmlHttp.open("post", "news.php", true);
oXmlHttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
oXmlHttp.onreadystatechange = function () {
if (oXmlHttp.readyState == 4) {
if (oXmlHttp.status == 200) {
showNewsdata(oXmlHttp.responseText);
} else {
showNotice(oXmlHttp.statusText);
}
}
};
oXmlHttp.send('newsmode=' + n);
}
function showNewsdata(newsdata) {
news = newsdata.parseJSON();
if(news['msg']){
newchat = '';
for(var nid in news['msg']) {
if(nid == 'toJSONString') {continue;}
newchat += news['msg'][nid];
}
$('newsinfo').innerHTML = newchat;
} else {
$('newsinfo').innerHTML = news;
}
}
function showAlive(mode){
//window.location.href = 'alive.php?alivemode=' + mode;
var oXmlHttp = zXmlHttp.createRequest();
oXmlHttp.open("post", "alive.php", true);
oXmlHttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
oXmlHttp.onreadystatechange = function () {
if (oXmlHttp.readyState == 4) {
if (oXmlHttp.status == 200) {
showAlivedata(oXmlHttp.responseText);
} else {
showNotice(oXmlHttp.statusText);
}
}
};
oXmlHttp.send('alivemode=' + mode);
}
function showAlivedata(alivedata) {
alive = alivedata.parseJSON();
$('alivelist').innerHTML = alive;
}
var refchat = null;
function chat(mode,reftime) {
clearTimeout(refchat);
var oXmlHttp = zXmlHttp.createRequest();
var sBody = getRequestBody(document.forms['sendchat']);
oXmlHttp.open("post", "chat.php", true);
oXmlHttp.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
oXmlHttp.onreadystatechange = function () {
if (oXmlHttp.readyState == 4) {
if (oXmlHttp.status == 200) {
showChatdata(oXmlHttp.responseText);
} else {
showNotice(oXmlHttp.statusText);
}
}
};
oXmlHttp.send(sBody);
if(mode == 'send'){$('chatmsg').value = '';$('sendmode').value = 'ref';}
rtime = reftime;
refchat = setTimeout("chat('ref',rtime)",rtime);
}
function showChatdata(jsonchat) {
chatdata = jsonchat.parseJSON();
if(chatdata['msg']) {
$('lastcid').value=chatdata['lastcid'];
newchat = '';
for(var cid in chatdata['msg']) {
if(cid == 'toJSONString') {continue;}
newchat += chatdata['msg'][cid];
}
$('chatlist').innerHTML = newchat + $('chatlist').innerHTML;
}
}
function openShutManager(oSourceObj,oTargetObj,shutAble,oOpenTip,oShutTip){
var sourceObj = typeof oSourceObj == "string" ? document.getElementById(oSourceObj) : oSourceObj;
var targetObj = typeof oTargetObj == "string" ? document.getElementById(oTargetObj) : oTargetObj;
var openTip = oOpenTip || "";
var shutTip = oShutTip || "";
if(targetObj.style.display!="none"){
if(shutAble) return;
targetObj.style.display="none";
if(openTip && shutTip){
sourceObj.innerHTML = shutTip;
}
} else {
targetObj.style.display="block";
if(openTip && shutTip){
sourceObj.innerHTML = openTip;
}
}
}
include/game/itemmain.func.php
View file @
35092579
...
...
@@ -14,7 +14,7 @@ if(!defined('IN_GAME')) {
function
trap
(){
global
$log
,
$cmd
,
$mode
,
$iteminfo
,
$itm0
,
$itmk0
,
$itme0
,
$itms0
,
$itmsk0
,
$nick
;
global
$name
,
$now
,
$hp
,
$db
,
$tablepre
,
$bid
,
$lvl
,
$pid
,
$type
,
$tactic
,
$club
,
$skills
;
global
$name
,
$now
,
$hp
,
$db
,
$tablepre
,
$bid
,
$lvl
,
$pid
,
$type
,
$tactic
,
$club
,
$skills
,
$rp
;
global
$wepsk
,
$arbsk
,
$arhsk
,
$arask
,
$arfsk
,
$artsk
,
$achievement
;
$playerflag
=
$itmsk0
?
true
:
false
;
...
...
@@ -59,6 +59,7 @@ function trap(){
}
else
{
$damage
=
round
(
rand
(
0
,
$itme0
/
2
)
+
(
$itme0
/
2
));
$damage
=
$tactic
==
2
?
round
(
$damage
*
0.75
)
:
$damage
;
$rp
=
$rp
/
2
;
//尝试修复RP踩雷可能不削半问题
//好人卡特别活动
global
$itm1
,
$itmk1
,
$itms1
,
$itm2
,
$itmk2
,
$itms2
,
$itm3
,
$itmk3
,
$itms3
,
$itm4
,
$itmk4
,
$itms4
,
$itm5
,
$itmk5
,
$itms5
;
$goodmancard
=
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment