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
02b26a15
Commit
02b26a15
authored
May 22, 2023
by
hisuinohoshi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix all day fix
变化: - 微调了蔷薇系列的合成条件&属性; 修正: - 礼品盒名未正常显示的问题; - 道具来源处头衔名未正常显示的问题; - 击杀敌人时,遗言主语错位的问题;
parent
14ad96f3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
14 additions
and
14 deletions
+14
-14
gamedata/cache/mixitem_1.php
gamedata/cache/mixitem_1.php
+3
-3
include/game/item.func.php
include/game/item.func.php
+8
-8
include/game/itemplace.func.php
include/game/itemplace.func.php
+2
-2
include/state.func.php
include/state.func.php
+1
-1
No files found.
gamedata/cache/mixitem_1.php
View file @
02b26a15
...
...
@@ -40,9 +40,9 @@ $mixinfo = array
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'护手剑'
,
'毒药'
),
'result'
=>
array
(
'浸毒刺剑'
,
'WK'
,
50
,
45
,
'NKp'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'浸毒刺剑'
,
'妖精的羽翼'
,
'『祝福宝石』'
),
'result'
=>
array
(
'☆公主细剑☆'
,
'WK'
,
225
,
80
,
'Nnp'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'☆公主细剑☆'
,
'★荆棘王冠★'
,
'真 - 幻想戏服'
),
'result'
=>
array
(
'★女王细剑★'
,
'WK'
,
655
,
255
,
'HNnpc'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'★女王细剑★'
,
'神之操控'
,
'安雅人体冰雕'
),
'result'
=>
array
(
'「女王蔷薇」'
,
'WK'
,
1926
,
'∞'
,
'HNnrpc'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'「女王蔷薇」'
,
'■DeathNote■'
,
'悲叹之种'
),
'result'
=>
array
(
'「皇家蔷薇」'
,
'WK'
,
17740
,
'∞'
,
'Nnrpc
'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'「皇家蔷薇」'
,
'龙虎旗帜'
),
'result'
=>
array
(
'「猩红蔷薇」'
,
'WK'
,
179310
,
'∞'
,
'BNnrfc'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'★女王细剑★'
,
'神之操控'
,
'
职人的拿手'
,
'传说的绒边手套'
,
'
安雅人体冰雕'
),
'result'
=>
array
(
'「女王蔷薇」'
,
'WK'
,
1926
,
'∞'
,
'HNnrpc'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'「女王蔷薇」'
,
'■DeathNote■'
,
'悲叹之种'
,
'魔法蜂针'
),
'result'
=>
array
(
'「皇家蔷薇」'
,
'WK'
,
17740
,
'∞'
,
'Nnrpcv
'
),),
array
(
'class'
=>
'wk'
,
'stuff'
=>
array
(
'「皇家蔷薇」'
,
'龙虎旗帜'
),
'result'
=>
array
(
'「猩红蔷薇」'
,
'WK'
,
179310
,
'∞'
,
'BNnrfc
V
'
),),
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'电击鞭'
,
'原型武器P'
,
'实验装甲A'
),
'result'
=>
array
(
'『T-LINK念动冲拳』'
,
'WP'
,
180
,
'∞'
,
'eN'
),),
array
(
'class'
=>
'wp'
,
'stuff'
=>
array
(
'☆电击器☆'
,
'原型武器P'
,
'实验装甲A'
),
'result'
=>
array
(
'『T-LINK念动冲拳』'
,
'WP'
,
240
,
'∞'
,
'eN'
),),
...
...
include/game/item.func.php
View file @
02b26a15
...
...
@@ -883,10 +883,10 @@ function itemuse($itmn,&$data=NULL) {
//你们这帮乱用itmk的都乖乖自觉归类!itmk空间也是有限的!
$log
.=
"你打开了<span class=
\"
yellow
\"
>
$itm
</span>。<br>"
;
$itms
--
;
$itms
--
;
$oitm
=
$itm
;
$oitmk
=
$itmk
;
if
(
$itms
<=
0
)
destory_single_item
(
$data
,
$itmn
,
1
);
if
(
strpos
(
$itmk
,
'ps'
)
===
0
){
//银色盒子
if
(
strpos
(
$
o
itmk
,
'ps'
)
===
0
){
//银色盒子
include_once
config
(
'randomitem'
,
$gamecfg
);
//1st case of the new diceroll system.
//include_once GAME_ROOT.'./include/game/dice.func.php';
...
...
@@ -915,7 +915,7 @@ function itemuse($itmn,&$data=NULL) {
$rand
=
rand
(
0
,
count
(
$itemflag
)
-
1
);
list
(
$in
,
$ik
,
$ie
,
$is
,
$isk
)
=
explode
(
','
,
$itemflag
[
$rand
]);
}
}
elseif
(
strpos
(
$itmk
,
'p0'
)
===
0
){
//新福袋·VOL1
}
elseif
(
strpos
(
$
o
itmk
,
'p0'
)
===
0
){
//新福袋·VOL1
// 用$clbpara['opened_pack']记录打开福袋的名称,只要有这个名称,就搞事!
if
(
!
empty
(
$clbpara
[
'opened_pack'
])){
$log
.=
"似乎你本轮已经打开过福袋,因此不能再打开更多的福袋!<br>"
;
...
...
@@ -978,13 +978,13 @@ function itemuse($itmn,&$data=NULL) {
}
//global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$mode;
$itm0
=
$in
;
$itmk0
=
$ik
;
$itme0
=
$ie
;
$itms0
=
$is
;
$itmsk0
=
$isk
;
addnews
(
$now
,
'present'
,
$name
,
$itm
,
$in
);
addnews
(
$now
,
'present'
,
$name
,
$
o
itm
,
$in
);
include_once
GAME_ROOT
.
'./include/game/itemmain.func.php'
;
itemget
(
$data
);
}
elseif
(
strpos
(
$itmk
,
'ygo'
)
===
0
){
$log
.=
"你打开了<span class=
\"
yellow
\"
>
$itm
</span>。<br>"
;
$itms
--
;
$itms
--
;
$oitm
=
$itm
;
if
(
$itms
<=
0
)
destory_single_item
(
$data
,
$itmn
,
1
);
$file1
=
config
(
'box'
,
$gamecfg
);
...
...
@@ -993,13 +993,13 @@ function itemuse($itmn,&$data=NULL) {
list
(
$in
,
$ik
,
$ie
,
$is
,
$isk
)
=
explode
(
','
,
$plist1
[
$rand1
]);
//global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$mode;
$itm0
=
$in
;
$itmk0
=
$ik
;
$itme0
=
$ie
;
$itms0
=
$is
;
$itmsk0
=
$isk
;
addnews
(
$now
,
'present'
,
$nickinfo
.
' '
.
$name
,
$itm
,
$in
);
addnews
(
$now
,
'present'
,
$nickinfo
.
' '
.
$name
,
$
o
itm
,
$in
);
include_once
GAME_ROOT
.
'./include/game/itemmain.func.php'
;
itemget
(
$data
);
}
elseif
(
strpos
(
$itmk
,
'fy'
)
===
0
){
$log
.=
"你打开了<span class=
\"
yellow
\"
>
$itm
</span>。<br>"
;
$itms
--
;
$itms
--
;
$oitm
=
$itm
;
if
(
$itms
<=
0
)
destory_single_item
(
$data
,
$itmn
,
1
);
$file1
=
config
(
'fy'
,
$gamecfg
);
...
...
@@ -1008,7 +1008,7 @@ function itemuse($itmn,&$data=NULL) {
list
(
$in
,
$ik
,
$ie
,
$is
,
$isk
)
=
explode
(
','
,
$plist1
[
$rand1
]);
//global $itm0,$itmk0,$itme0,$itms0,$itmsk0,$mode;
$itm0
=
$in
;
$itmk0
=
$ik
;
$itme0
=
$ie
;
$itms0
=
$is
;
$itmsk0
=
$isk
;
addnews
(
$now
,
'present'
,
$nickinfo
.
' '
.
$name
,
$itm
,
$in
);
addnews
(
$now
,
'present'
,
$nickinfo
.
' '
.
$name
,
$
o
itm
,
$in
);
include_once
GAME_ROOT
.
'./include/game/itemmain.func.php'
;
itemget
(
$data
);
...
...
include/game/itemplace.func.php
View file @
02b26a15
...
...
@@ -401,14 +401,14 @@ function get_item_place($which)
//NPC掉落
$result
.=
get_item_npcdrop
(
$which
);
//头衔附赠
global
$title_valid
;
global
$title_valid
,
$titles_list
;
foreach
(
$title_valid
as
$tv
=>
$tvarr
)
{
foreach
(
$tvarr
as
$tvkey
=>
$tvitm
)
{
if
(
in_array
(
$tvkey
,
array
(
'wep'
,
'arb'
,
'arh'
,
'ara'
,
'arf'
,
'art'
,
'itm1'
,
'itm2'
,
'itm3'
,
'itm4'
,
'itm5'
,
'itm6'
))
&&
(
$which
==
$tvitm
))
{
$result
.=
"头衔【
{
$t
v
}
】的入场奖励
\r
"
;
$result
.=
"头衔【
{
$t
itles_list
[
$tv
]
}
】的入场奖励
\r
"
;
break
;
}
}
...
...
include/state.func.php
View file @
02b26a15
...
...
@@ -280,7 +280,7 @@
//死者是玩家,增加击杀数并保存系统状况。
$pa
[
'killnum'
]
++
;
$alivenum
--
;
if
(
!
empty
(
$last
))
$log
.=
"<span class='evergreen'>
你
用尽最后的力气喊道:“"
.
$last
.
"”</span><br>"
;
if
(
!
empty
(
$last
))
$log
.=
"<span class='evergreen'>
{
$pd
[
'nm'
]
}
用尽最后的力气喊道:“"
.
$last
.
"”</span><br>"
;
}
else
{
...
...
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