Commit cd06a16a authored by Chunchi Che's avatar Chunchi Che

Merge branch 'fix/fts' into 'main'

修复卡片搜索只能搜到怪兽卡的问题

See merge request mycard/Neos!271
parents 888bd8b5 e9be2905
Pipeline #23203 failed with stages
in 11 minutes and 44 seconds
...@@ -51,26 +51,28 @@ function getFtsCondtions(conditions: FtsConditions): string { ...@@ -51,26 +51,28 @@ function getFtsCondtions(conditions: FtsConditions): string {
const assertMonster = `(type & ${TYPE_MONSTER}) > 0`; const assertMonster = `(type & ${TYPE_MONSTER}) > 0`;
const typesCondition = types const typesCondition = types
?.map((type) => `(type & ${type}) > 0`) .map((type) => `(type & ${type}) > 0`)
.join(" OR "); .join(" OR ");
const levelsCondition = levels const levelsCondition = levels
?.map((level) => `level = ${level}`) .map((level) => `level = ${level}`)
.join(" OR "); .join(" OR ");
const atkCondition = atk const atkCondition =
atk.min !== null || atk.max !== null
? `atk BETWEEN ${handleFinite(atk.min, "min")} AND ${handleFinite( ? `atk BETWEEN ${handleFinite(atk.min, "min")} AND ${handleFinite(
atk.max, atk.max,
"max", "max",
)} AND ${assertMonster}` )} AND ${assertMonster}`
: undefined; : undefined;
const defCondition = def const defCondition =
def.min !== null || def.max !== null
? `def BETWEEN ${handleFinite(def.min, "min")} AND ${handleFinite( ? `def BETWEEN ${handleFinite(def.min, "min")} AND ${handleFinite(
def.max, def.max,
"max", "max",
)} AND ${assertMonster}` )} AND ${assertMonster}`
: undefined; : undefined;
const raceCondition = races?.map((race) => `race = ${race}`).join(" OR "); const raceCondition = races.map((race) => `race = ${race}`).join(" OR ");
const attributeCondition = attributes const attributeCondition = attributes
?.map((attribute) => `attribute = ${attribute}`) .map((attribute) => `attribute = ${attribute}`)
.join(" OR "); .join(" OR ");
const merged = [ const merged = [
......
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