Commit f2c4f3fb authored by Nemo Ma's avatar Nemo Ma Committed by GitHub

Merge pull request #93 from hikawiier/waaagh

fix
parents 0dce79a7 c76eb7e1
......@@ -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;
}
......
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