From b4dd18cc194dc7e18dc5e5d631471b5a68948618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E5=82=91?= Date: Mon, 25 Jul 2022 21:47:20 +0800 Subject: [PATCH] =?UTF-8?q?Update=20version=20to=20v0.1.3=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=AD=94=E9=A2=98=E7=BB=9F=E8=AE=A1=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=8E=92=E8=A1=8C=E6=A6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle.kts | 2 +- src/main/kotlin/PluginData.kt | 38 +++++++++++ src/main/kotlin/PluginMain.kt | 125 ++++++++++++++++++++++++++-------- 3 files changed, 135 insertions(+), 30 deletions(-) create mode 100644 src/main/kotlin/PluginData.kt diff --git a/build.gradle.kts b/build.gradle.kts index 98831db..2110bd6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "top.jie65535" -version = "0.1.2" +version = "0.1.3" repositories { maven("https://maven.aliyun.com/repository/public") // 阿里云国内代理仓库 diff --git a/src/main/kotlin/PluginData.kt b/src/main/kotlin/PluginData.kt new file mode 100644 index 0000000..04da246 --- /dev/null +++ b/src/main/kotlin/PluginData.kt @@ -0,0 +1,38 @@ +package top.jie65535.j24 + +import net.mamoe.mirai.console.data.AutoSavePluginData +import net.mamoe.mirai.console.data.value + +object PluginData : AutoSavePluginData("data") { + + /** + * 统计数据 + * -群 + * - 群员 + * - 数据 + */ + val stats: MutableMap> by value() +} + +@kotlinx.serialization.Serializable +data class PlayerStat( + /** + * 总答题数 + */ + var totalCount: Int = 0, + + /** + * 统计答题数 + */ + var count: Int = 0, + + /** + * 平均答题时间(S) + */ + var avgTime: Double = 0.0, + + /** + * 最快答题时间(S) + */ + var minTime: Double = Double.MAX_VALUE, +) \ No newline at end of file diff --git a/src/main/kotlin/PluginMain.kt b/src/main/kotlin/PluginMain.kt index f12402c..17ee733 100644 --- a/src/main/kotlin/PluginMain.kt +++ b/src/main/kotlin/PluginMain.kt @@ -3,10 +3,12 @@ package top.jie65535.j24 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescription import net.mamoe.mirai.console.plugin.jvm.KotlinPlugin +import net.mamoe.mirai.contact.nameCardOrNick import net.mamoe.mirai.event.GlobalEventChannel import net.mamoe.mirai.event.events.GroupMessageEvent import net.mamoe.mirai.event.subscribeGroupMessages import net.mamoe.mirai.utils.info +import java.text.DecimalFormat import java.time.Duration import java.time.LocalDateTime @@ -14,7 +16,7 @@ object PluginMain : KotlinPlugin( JvmPluginDescription( id = "top.jie65535.j24", name = "J 24点游戏", - version = "0.1.2" + version = "0.1.3" ) { author("jie65535") info("24点游戏") @@ -22,43 +24,108 @@ object PluginMain : KotlinPlugin( ) { private val games: MutableMap = mutableMapOf() + private val df = DecimalFormat("0.00") + private const val prefix = "=" + /** + * 排行榜计时器 + * 为了防止频繁刷屏，记录出榜时间，一定间隔后才可再次触发 + */ + private val rankTimes = mutableMapOf() + override fun onEnable() { logger.info { "Plugin loaded" } PluginCommand.register() PluginConfig.reload() + PluginData.reload() - val eventChannel = GlobalEventChannel.parentScope(this) - eventChannel.filter { it is GroupMessageEvent && PluginConfig.enabledGroups.contains(it.group.id) }.subscribeGroupMessages { - startsWith("24点") reply { - var game = games[group.id] - if (game == null || game.time.plusMinutes(1) < LocalDateTime.now()) { - game = Point24() - games[group.id] = game - "请用 $game 组成结果为24的算式，以'$prefix'开头验证" - } else Unit - } + GlobalEventChannel.parentScope(this) + .filter { it is GroupMessageEvent && PluginConfig.enabledGroups.contains(it.group.id) } + .subscribeGroupMessages { + "24点" reply { + var game = games[group.id] + if (game == null || game.time.plusMinutes(1) < LocalDateTime.now()) { + game = Point24() + games[group.id] = game + "请用 $game 组成结果为24的算式，以'$prefix'开头验证" + } else Unit + } - startsWith(prefix) quoteReply { - val game = games[group.id] - if (game != null) { - try { - val result = game.evaluate(message.contentToString().removePrefix(prefix).trim()) - if (result == 24.0) { - val newGame = Point24() - games[group.id] = newGame - val duration = Duration.between(game.time, LocalDateTime.now()) - "答对了！ ${duration.toMinutes()}:${duration.toSecondsPart()}\n下一题：$newGame" - } else { - "答错了，计算结果为 $result" - } - } catch (e: Throwable) { + "24点榜" reply { + val g = PluginData.stats[group.id] + // 一小时内仅可查询一次 + if (g != null && rankTimes[group.id]?.plusHours(1)?.isBefore(LocalDateTime.now()) != false) { + // 记录查询时间 + rankTimes[group.id] = LocalDateTime.now() + // 拼接排行榜 + val sb = StringBuilder() + sb.appendLine("[均时榜]") + sb.append(g.entries.sortedBy { it.value.avgTime }.take(3).joinToString("\n") { + "${df.format(it.value.avgTime)}s | ${group[it.key]?.nameCardOrNick ?: "侠名"}" + }).appendLine().appendLine() + sb.appendLine("[速度榜]") + sb.append(g.entries.sortedBy { it.value.minTime }.take(3).joinToString("\n") { + "${df.format(it.value.minTime)}s | ${group[it.key]?.nameCardOrNick ?: "侠名"}" + }).appendLine().appendLine() + sb.appendLine("[答题榜]") + sb.append(g.entries.sortedByDescending { it.value.totalCount }.take(3).joinToString("\n") { + "${it.value.totalCount} 道 | ${group[it.key]?.nameCardOrNick ?: "侠名"}" + }) + sb.toString() + } else Unit + } + + startsWith(prefix) quoteReply { + val game = games[group.id] + if (game != null) { + try { + val result = game.evaluate(message.contentToString().removePrefix(prefix).trim()) + if (result == 24.0) { + val newGame = Point24() + games[group.id] = newGame + val duration = Duration.between(game.time, LocalDateTime.now()) + + // 群 + var g = PluginData.stats[group.id] + if (g == null) { + g = mutableMapOf() + PluginData.stats[group.id] = g + } + // 玩家 + var stat = g[sender.id] + if (stat == null) { + stat = PlayerStat() + g[sender.id] = stat + } + // 答题数增加 + stat.totalCount += 1 + // 用时 + val t = duration.seconds + duration.nano / 1000000000.0 + if (stat.minTime > t) { + stat.minTime = t + } + // 仅统计百秒内的平均值 + if (t < 100) { + // 计数增加 + stat.count += 1 + // 更新均值 + stat.avgTime += (t - stat.avgTime) / stat.count + + "答对了！用时:${df.format(t)}s 平均:${df.format(stat.avgTime)}s 最快:${df.format(stat.minTime)}s\n" + + "下一题：$newGame" + } else { + "答对了！下一题：$newGame" + } + } else { + "答错了，计算结果为 $result" + } + } catch (e: Throwable) { // logger.error(e) - "错误：${e.message}" - } - } else Unit + "错误：${e.message}" + } + } else Unit + } } - } } }