diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt index 3e106dfa..358728db 100644 --- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt +++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/utils/UtilsFactory.kt @@ -140,25 +140,25 @@ internal inline fun T.conditions(initiate: Conditions.() -> Unit) = Condi internal class Conditions(internal var value: T) { /** 全部判断条件数组 (与) */ - private val popularConditions = ArrayList() + private val andConditions = ArrayList() /** 全部判断条件数组 (与成立 - 非忽略) */ - private val includeConditions = ArrayList() + private val optConditions = ArrayList() /** * 添加与 (and) 条件 * @param value 条件值 */ internal fun and(value: Boolean) { - popularConditions.add(value) + andConditions.add(value) } /** - * 添加与 (and) 后成立且不与 (and) 后忽略条件 + * 添加与 (and) 条件 (可选) * @param value 条件值 */ - internal fun include(value: Boolean) { - includeConditions.add(value) + internal fun opt(value: Boolean) { + optConditions.add(value) } /** @@ -177,8 +177,8 @@ internal class Conditions(internal var value: T) { * @return [Boolean] */ private val result by lazy { - includeConditions.takeIf { it.isNotEmpty() }?.any { it.not() }?.not() == true || - popularConditions.takeIf { it.isNotEmpty() }?.any { it.not() }?.not() == true + optConditions.takeIf { it.isNotEmpty() }?.any { it.not() }?.not() == true || + andConditions.takeIf { it.isNotEmpty() }?.any { it.not() }?.not() == true } /**