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
f2c4f3fb
Commit
f2c4f3fb
authored
Mar 27, 2023
by
Nemo Ma
Committed by
GitHub
Mar 27, 2023
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #93 from hikawiier/waaagh
fix
parents
0dce79a7
c76eb7e1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
include/resources.func.php
include/resources.func.php
+6
-2
No files found.
include/resources.func.php
View file @
f2c4f3fb
...
...
@@ -26,8 +26,12 @@ function get_equip_list($mode=0)
# mixitem_1.php; vnmixitem_1.php;
function
get_mixinfo
()
{
include
config
(
"mixitem"
,
1
);
include
config
(
"vnmixitem"
,
1
);
global
$gamecfg
;
include
config
(
"mixitem"
,
$gamecfg
);
if
(
file_exists
(
config
(
"vnmixitem"
,
$gamecfg
)))
{
include
config
(
"vnmixitem"
,
$gamecfg
);
}
if
(
!
empty
(
$vn_mixinfo
))
$mixinfo
=
array_merge
(
$mixinfo
,
$vn_mixinfo
);
return
$mixinfo
;
}
...
...
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