docker/relationship
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mumuy/relationship

Browse Source
This commit is contained in:
PASSER-BY
2023-01-03 01:00:23 +08:00
parent 0fa8f5d427 0a1e3db510
commit 318e79bbae
5 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/module/selector.js
View File

@@ -21,7 +21,12 @@ var getOptimal = function(options){
sex = from_chain[i].match(/^([fhs1](&[ol\d]+)?|[olx]b)(&[ol\d]+)?/)?1:0;
continue;
}else{
if(getGenById(from_chain[i])==getGenById(to_chain[i])&&from_chain[i].match(/^[xol][bs]|^[sd]/)){
if(getGenById(from_chain[i])==getGenById(to_chain[i])&&from_chain[i].match(/^[xol][bs]|^[sd]/)&&to_chain[i].match(/^[xol][bs]|^[sd]/)){
var form_type = from_chain[i].replace(/&([ol\d]+)/,'').replace(/^[xol]([bs])/,'$1');
var to_type = to_chain[i].replace(/&([ol\d]+)/,'').replace(/^[xol]([bs])/,'$1');
if(form_type!=to_type){
break;
}
var from_match = from_chain[i].match(/&([ol\d]+)/);
var to_match = to_chain[i].match(/&([ol\d]+)/);
if(!from_match){

2
src/relationship.js
View File

@@ -33,7 +33,7 @@ var relationship = function (parameter){
sex:options.sex,
optimal:options.optimal
}).forEach(function(data){
// console.log('[data]',from_selector,to_selector,data);
// console.log('[data]',from_selector,to_selector,options.optimal,data);
var ids = data?selector2id(data['selector'],data['sex']):[];
// console.log('[ids]',data['selector'],data['sex'],ids);
ids.forEach(function(id){