diff --git a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt index 806bbbde5..5adf1b3db 100644 --- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt +++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/utils/BotConfiguration.common.kt @@ -52,26 +52,24 @@ expect open class BotConfiguration() : BotConfigurationBase { @ConfigurationDsl fun randomDeviceInfo() + /** + * 协议类型, 服务器仅允许使用不同协议同时登录. + */ enum class MiraiProtocol { /** * Android 手机. - * - * - 与手机冲突 - * - 与平板和电脑不冲突 */ ANDROID_PHONE, /** * Android 平板. - * - * - 与平板冲突 - * - 与手机和电脑不冲突 */ ANDROID_PAD, /** * Android 手表. * */ + @SinceMirai("1.1.0") ANDROID_WATCH; diff --git a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt index 531567e5d..71906be41 100644 --- a/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt +++ b/mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/BotConfiguration.kt @@ -134,23 +134,18 @@ actual open class BotConfiguration : BotConfigurationBase() { // open for Java ) { /** * Android 手机. - * - * - 与手机冲突 - * - 与平板和电脑不冲突 */ ANDROID_PHONE(537062845), /** * Android 平板. - * - * - 与平板冲突 - * - 与手机和电脑不冲突 */ ANDROID_PAD(537062409), /** * Android 手表. * */ + @SinceMirai("1.1.0") ANDROID_WATCH(537061176) }